diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-03-20 23:30:08 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-03-20 23:30:08 +0300 |
| commit | 3058a8fa4c1dfdf50a6f274bfbf280f8d2137168 (patch) | |
| tree | 8e0ac2d83bbb4bf8f6727c3230c8dc0d59aa61a8 | |
| parent | fd8d44ca6188b2ad9d6931ce385e61217724a712 (diff) | |
Fix "Shared projects" tab
| -rw-r--r-- | app/controllers/groups_controller.rb | 4 | ||||
| -rw-r--r-- | app/finders/group_projects_finder.rb | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 48565f44ffb..87efb0a8970 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -44,7 +44,7 @@ class GroupsController < Groups::ApplicationController @projects = @projects.sort(@sort = params[:sort]) @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank? - @shared_projects = GroupProjectsFinder.new(group, shared: true).execute(current_user) + @shared_projects = GroupProjectsFinder.new(group, only_shared: true).execute(current_user) respond_to do |format| format.html @@ -77,7 +77,7 @@ class GroupsController < Groups::ApplicationController end def projects - @projects = @projects.sorted_by_activity.page(params[:page]) + @projects = @group.projects.page(params[:page]) end def update diff --git a/app/finders/group_projects_finder.rb b/app/finders/group_projects_finder.rb index 84fe468ae5d..2470af7c685 100644 --- a/app/finders/group_projects_finder.rb +++ b/app/finders/group_projects_finder.rb @@ -13,29 +13,29 @@ class GroupProjectsFinder < UnionFinder private def group_projects(current_user) - include_owned = @options.fetch(:owned, true) - include_shared = @options.fetch(:shared, true) + only_owned = @options.fetch(:only_owned, false) + only_shared = @options.fetch(:only_shared, false) projects = [] if current_user if @group.users.include?(current_user) - projects << @group.projects if include_owned - projects << @group.shared_projects if include_shared + projects << @group.projects unless only_shared + projects << @group.shared_projects unless only_owned else - if include_owned + unless only_shared projects << @group.projects.visible_to_user(current_user) projects << @group.projects.public_to_user(current_user) end - if include_shared + unless only_owned projects << @group.shared_projects.visible_to_user(current_user) projects << @group.shared_projects.public_to_user(current_user) end end else - projects << @group.projects.public_only if include_owned - projects << @group.shared_projects.public_only if include_shared + projects << @group.projects.public_only unless only_shared + projects << @group.shared_projects.public_only unless only_owned end projects |