Fix per-project counters for Dashboard filters

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix per-project counters for Dashboard filters
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent f6a4e563
Showing 4 changed files with 9 additions and 15 deletions Show diff stats
app/helpers/dashboard_helper.rb
app/views/shared/_filter.html.haml
features/steps/dashboard/dashboard_issues.rb
features/steps/dashboard/dashboard_merge_requests.rb
@@ -14,17 +14,11 @@ module DashboardHelper
   end
  
   def entities_per_project(project, entity)
-    items = project.items_for(entity)
-
-    items = case params[:status]
-            when 'closed'
-              items.closed
-            when 'all'
-              items
-            else
-              items.opened
-            end
-
-    items.cared(current_user).count
+    case entity.to_sym
+    when :issue then @issues.where(project_id: project.id)
+    when :merge_request then @merge_requests.where(target_project_id: project.id)
+    else
+      []
+    end.count
   end
 end
@@ -6,7 +6,7 @@
           Assigned to me
       %li{class: ("active" if params[:scope] == 'authored')}
         = link_to filter_path(entity, scope: 'authored') do
-          Authored by me
+          Created by me
       %li{class: ("active" if params[:scope] == 'all')}
         = link_to filter_path(entity, scope: 'all') do
           All
@@ -34,7 +34,7 @@ class DashboardIssues &lt; Spinach::FeatureSteps
  
   step 'I click "Authored by me" link' do
     within ".scope-filter" do
-      click_link 'Authored by me'
+      click_link 'Created by me'
     end
   end
  
@@ -34,7 +34,7 @@ class DashboardMergeRequests &lt; Spinach::FeatureSteps
  
   step 'I click "Authored by me" link' do
     within ".scope-filter" do
-      click_link 'Authored by me'
+      click_link 'Created by me'
     end
   end
...	...	@@ -14,17 +14,11 @@ module DashboardHelper
14	14	end
15	15
16	16	def entities_per_project(project, entity)
17		- items = project.items_for(entity)
18		-
19		- items = case params[:status]
20		- when 'closed'
21		- items.closed
22		- when 'all'
23		- items
24		- else
25		- items.opened
26		- end
27		-
28		- items.cared(current_user).count
	17	+ case entity.to_sym
	18	+ when :issue then @issues.where(project_id: project.id)
	19	+ when :merge_request then @merge_requests.where(target_project_id: project.id)
	20	+ else
	21	+ []
	22	+ end.count
29	23	end
30	24	end
...	...
...	...	@@ -6,7 +6,7 @@
6	6	Assigned to me
7	7	%li{class: ("active" if params[:scope] == 'authored')}
8	8	= link_to filter_path(entity, scope: 'authored') do
9		- Authored by me
	9	+ Created by me
10	10	%li{class: ("active" if params[:scope] == 'all')}
11	11	= link_to filter_path(entity, scope: 'all') do
12	12	All
...	...
...	...	@@ -34,7 +34,7 @@ class DashboardIssues < Spinach::FeatureSteps
34	34
35	35	step 'I click "Authored by me" link' do
36	36	within ".scope-filter" do
37		- click_link 'Authored by me'
	37	+ click_link 'Created by me'
38	38	end
39	39	end
40	40
...	...
...	...	@@ -34,7 +34,7 @@ class DashboardMergeRequests < Spinach::FeatureSteps
34	34
35	35	step 'I click "Authored by me" link' do
36	36	within ".scope-filter" do
37		- click_link 'Authored by me'
	37	+ click_link 'Created by me'
38	38	end
39	39	end
40	40
...	...