deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix group duplication on dashboard and project order in group

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-11-29 16:43:09 +02:00
parent ff9a2e2a93
commit 1d889a79fb
4 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/groups_controller.rb
View file

@ -54,10 +54,12 @@ class GroupsController < ApplicationController
end
def projects
@projects ||= if can?(current_user, :manage_group, @group)
@group.projects.all
else
current_user.projects_sorted_by_activity.where(namespace_id: @group.id)
@projects ||= begin
if can?(current_user, :manage_group, @group)
@group.projects
else
current_user.projects.where(namespace_id: @group.id)
end.sorted_by_activity.all
end
end