diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 48565f44ffbf7103d154805e103770ccbfc9def1..87efb0a89705ab5be37fed293b1154698c73b7b6 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 84fe468ae5d769b0dc7d81a3cb66a37386b8ec8a..2470af7c6850bb20ee9183dd51934d6be964ef7d 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