summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-21 09:14:05 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2012-11-21 09:14:05 +0300
commitab42370af01a52c0ba3cfd97d365c735ecb4c468 (patch)
tree4a2ca619f46e5019db85421b8a9c1f8fec83e605 /app
parent23734a715e622f3f028bd565df3be130d3aba737 (diff)
downloadgitlab-ce-ab42370af01a52c0ba3cfd97d365c735ecb4c468.tar.gz
Fix sattellites
Diffstat (limited to 'app')
-rw-r--r--app/helpers/dashboard_helper.rb4
-rw-r--r--app/views/dashboard/_filter.html.haml9
2 files changed, 9 insertions, 4 deletions
diff --git a/app/helpers/dashboard_helper.rb b/app/helpers/dashboard_helper.rb
index b73c1c1e1c2..540a73effe8 100644
--- a/app/helpers/dashboard_helper.rb
+++ b/app/helpers/dashboard_helper.rb
@@ -7,4 +7,8 @@ module DashboardHelper
dashboard_merge_requests_path(options)
end
end
+
+ def entities_per_project project, entity
+ project.items_for(entity).where(assignee_id: current_user.id).count
+ end
end
diff --git a/app/views/dashboard/_filter.html.haml b/app/views/dashboard/_filter.html.haml
index 98961b3f373..fc00ca72d63 100644
--- a/app/views/dashboard/_filter.html.haml
+++ b/app/views/dashboard/_filter.html.haml
@@ -21,10 +21,11 @@
%legend Projects:
%ul.nav.nav-pills.nav-stacked
- @projects.each do |project|
- %li{class: ("active" if params[:project_id] == project.id.to_s)}
- = link_to dashboard_filter_path(entity, project_id: project.id) do
- = project.name_with_namespace
- %small.right= project.items_for(entity).where(assignee_id: current_user.id).count
+ - unless entities_per_project(project, entity).zero?
+ %li{class: ("active" if params[:project_id] == project.id.to_s)}
+ = link_to dashboard_filter_path(entity, project_id: project.id) do
+ = project.name_with_namespace
+ %small.right= entities_per_project(project, entity)
%fieldset
%hr