scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-30 20:23:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix broken global activities team filter

Browse source
This commit is contained in:
Mojca Lorber 2019-05-14 13:50:10 +02:00
parent 70c4094323
commit 54f735551c
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/team.rb
View file

@ -2,7 +2,6 @@ class Team < ApplicationRecord
include SearchableModel
include ViewableModel
include TeamBySubjectModel
include InputSanitizeHelper
# Not really MVC-compliant, but we just use it for logger
# output in space_taken related functions
@ -322,7 +321,7 @@ class Team < ApplicationRecord
query = query.where(id: users_team)
end
query = query.where(id: team_by_subject(filters[:subjects])) if filters[:subjects]
query.select(:id, :name).map { |res| [res[0], escape_input(res[1])] }
query.select(:id, :name).map { |i| { id: i[:id], name: ApplicationController.helpers.escape_input(i[:name]) } }
end
private