project.issues_labels method

randx
1 parent fa325ce9
Showing 3 changed files with 7 additions and 2 deletions Show diff stats
app/controllers/labels_controller.rb
app/models/project.rb
app/roles/issue_commonality.rb
@@ -7,7 +7,7 @@ class LabelsController &lt; ProjectResourceController
   respond_to :js, :html
  
   def index
-    @labels = @project.issues.tag_counts_on(:labels).order('count DESC')
+    @labels = @project.issues_labels.order('count DESC')
   end
  
   protected
@@ -159,6 +159,10 @@ class Project &lt; ActiveRecord::Base
   def project_id
     self.id
   end
+
+  def issues_labels
+    issues.tag_counts_on(:labels)
+  end
 end
  
 # == Schema Information
-# Contains common functionality shared between Issues and MergeRequests
+# Contains common functionality
+# shared between Issues and MergeRequests
 module IssueCommonality
   extend ActiveSupport::Concern
...	...	@@ -7,7 +7,7 @@ class LabelsController < ProjectResourceController
7	7	respond_to :js, :html
8	8
9	9	def index
10		- @labels = @project.issues.tag_counts_on(:labels).order('count DESC')
	10	+ @labels = @project.issues_labels.order('count DESC')
11	11	end
12	12
13	13	protected
...	...
...	...	@@ -159,6 +159,10 @@ class Project < ActiveRecord::Base
159	159	def project_id
160	160	self.id
161	161	end
	162	+
	163	+ def issues_labels
	164	+ issues.tag_counts_on(:labels)
	165	+ end
162	166	end
163	167
164	168	# == Schema Information
...	...
1		-# Contains common functionality shared between Issues and MergeRequests
	1	+# Contains common functionality
	2	+# shared between Issues and MergeRequests
2	3	module IssueCommonality
3	4	extend ActiveSupport::Concern
4	5
...	...