Improved Issues and MR filters
This commit is contained in:
parent
ade80e5c4d
commit
d7c5885c3d
2 changed files with 21 additions and 3 deletions
|
@ -1,5 +1,12 @@
|
|||
module DashboardHelper
|
||||
def dashboard_filter_path(entity, options={})
|
||||
exist_opts = {
|
||||
status: params[:status],
|
||||
project_id: params[:project_id],
|
||||
}
|
||||
|
||||
options = exist_opts.merge(options)
|
||||
|
||||
case entity
|
||||
when 'issue' then
|
||||
dashboard_issues_path(options)
|
||||
|
@ -9,6 +16,17 @@ module DashboardHelper
|
|||
end
|
||||
|
||||
def entities_per_project project, entity
|
||||
project.items_for(entity).where(assignee_id: current_user.id).count
|
||||
items = project.items_for(entity)
|
||||
|
||||
items = case params[:status]
|
||||
when 'closed'
|
||||
items.closed
|
||||
when 'all'
|
||||
items
|
||||
else
|
||||
items.opened
|
||||
end
|
||||
|
||||
items.where(assignee_id: current_user.id).count
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue