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

Improve styles. Add merge request completness to milestone percentage

Browse source
This commit is contained in:
randx 2012-10-29 22:40:00 +02:00
parent ecdf778e80
commit d4e070cfad
4 changed files with 37 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/contexts/merge_requests_load_context.rb
View file

@ -1,29 +1,31 @@
# Build collection of Merge Requests
# based on filtering passed via params for @project
class MergeRequestsLoadContext < BaseContext
def execute
type = params[:f]
merge_requests = @project.merge_requests
merge_requests = project.merge_requests
merge_requests = case type
when 'all' then merge_requests
when 'closed' then merge_requests.closed
when 'assigned-to-me' then merge_requests.opened.assigned(current_user)
else merge_requests.opened
end.page(params[:page]).per(20)
end
merge_requests.includes(:author, :project).order("closed, created_at desc")
@merge_requests = merge_requests
merge_requests = merge_requests.page(params[:page]).per(20)
merge_requests = merge_requests.includes(:author, :project).order("closed, created_at desc")
# Filter by specific assignee_id (or lack thereof)?
if params[:assignee_id].present?
@merge_requests = merge_requests.where(assignee_id: (params[:assignee_id] == '0' ? nil : params[:assignee_id]))
merge_requests = merge_requests.where(assignee_id: (params[:assignee_id] == '0' ? nil : params[:assignee_id]))
end
# Filter by specific milestone_id (or lack thereof)?
if params[:milestone_id].present?
@merge_requests = merge_requests.where(milestone_id: (params[:milestone_id] == '0' ? nil : params[:milestone_id]))
merge_requests = merge_requests.where(milestone_id: (params[:milestone_id] == '0' ? nil : params[:milestone_id]))
end
@merge_requests
merge_requests
end
end