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

Fixed group issues/mr. Also speedup project list of admin area

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-10-04 10:51:35 +03:00
parent c626ec3746
commit d88332709c
5 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/groups_controller.rb
View file

@ -21,13 +21,15 @@ class GroupsController < ApplicationController
# Get authored or assigned open merge requests
def merge_requests
@merge_requests = current_user.cared_merge_requests.order("created_at DESC").page(params[:page]).per(20)
@merge_requests = current_user.cared_merge_requests
@merge_requests = @merge_requests.of_group(@group).order("created_at DESC").page(params[:page]).per(20)
end
# Get only assigned issues
def issues
@user = current_user
@issues = current_user.assigned_issues.opened.order("created_at DESC").page(params[:page]).per(20)
@issues = current_user.assigned_issues.opened
@issues = @issues.of_group(@group).order("created_at DESC").page(params[:page]).per(20)
@issues = @issues.includes(:author, :project)
respond_to do |format|