scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-27 10:08:11 +08:00
Code Issues Projects Releases Packages Wiki Activity

User/teams are now alphabetically listed

Browse source
This commit is contained in:
Jure Grabnar 2019-03-27 13:49:55 +01:00
parent 9881ff38ee
commit 07609d34c8
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/global_activities_controller.rb
View file

@ -6,13 +6,14 @@ class GlobalActivitiesController < ApplicationController
selected_teams = if request.format.html?
current_team
elsif activity_filters[:teams].present?
@teams.where(id: activity_filters[:teams])
@teams.where(id: activity_filters[:teams]).order(name: :asc)
else
@teams
@teams.order(name: :asc)
end
@activity_types = Activity.activity_types_list
@user_list = User.where(id: UserTeam.where(team: current_user.teams).select(:user_id))
.distinct
.order(full_name: :asc)
.pluck(:full_name, :id)
@grouped_activities, @more_activities =
ActivitiesService.load_activities(current_user, selected_teams, activity_filters)