Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/dashboard_helper.rb')
-rw-r--r--app/helpers/dashboard_helper.rb20
1 files changed, 19 insertions, 1 deletions
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
index 540a73effe8..0baa5b4108e 100644
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
@@ -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