home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity

Fix "Shared projects" tab

Browse Source
This commit is contained in:
Douwe Maan
2016-03-20 21:30:08 +01:00
parent fd8d44ca61
commit 3058a8fa4c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/groups_controller.rb
+2 -2
View File
@@ -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
app/finders/group_projects_finder.rb
+8 -8
View File
@@ -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