diff --git a/app/controllers/global_activities_controller.rb b/app/controllers/global_activities_controller.rb index d91b8dd97..20dc81652 100644 --- a/app/controllers/global_activities_controller.rb +++ b/app/controllers/global_activities_controller.rb @@ -3,8 +3,8 @@ class GlobalActivitiesController < ApplicationController def index teams = activity_filters[:teams] - teams = current_user.teams if teams.blank? - @teams = teams + @teams = current_user.teams + teams = @teams.pluck(:id) if teams.blank? @activity_types = Activity.activity_types_list @user_list = User.where(id: UserTeam.where(team: current_user.teams).select(:user_id)) .distinct diff --git a/app/services/activities_service.rb b/app/services/activities_service.rb index 3f5db8e7c..77facf85d 100644 --- a/app/services/activities_service.rb +++ b/app/services/activities_service.rb @@ -4,7 +4,6 @@ class ActivitiesService def self.load_activities(user, teams, filters = {}) # Create condition for view permissions checking first visible_projects = Project.viewable_by_user(user, teams) - query = Activity.where('project_id IS NULL AND team_id IN (?)', teams) .or(Activity.where(project: visible_projects)) diff --git a/app/views/shared/_left_menu_bar.html.erb b/app/views/shared/_left_menu_bar.html.erb index bee8e0680..ce1bacbc7 100644 --- a/app/views/shared/_left_menu_bar.html.erb +++ b/app/views/shared/_left_menu_bar.html.erb @@ -56,7 +56,7 @@