Include default labels in issues autocomplete etc. Show colored labels on issues show page

Dmitriy Zaporozhets
1 parent be68cc46
Showing 9 changed files with 77 additions and 70 deletions Show diff stats
app/controllers/labels_controller.rb
app/helpers/issues_helper.rb
app/helpers/labels_helper.rb
app/models/project.rb
app/views/issues/show.html.haml
app/views/labels/_label.html.haml
app/views/labels/index.html.haml
lib/gitlab/issues_labels.rb
lib/gitlab/labels.rb
@@ -7,11 +7,11 @@ class LabelsController &lt; ProjectResourceController
   respond_to :js, :html
   def index
-    @labels = @project.issues_labels.order('count DESC')
+    @labels = @project.issues_labels
   end
   def generate
-    Gitlab::Labels.generate(@project)
+    Gitlab::IssuesLabels.generate(@project)
     redirect_to project_labels_path(@project)
   end
@@ -11,10 +11,6 @@ module IssuesHelper
     classes
   end
-  def issue_tags
-    @project.issues.tag_counts_on(:labels).map(&:name)
-  end
-
   # Returns an OpenStruct object suitable for use by <tt>options_from_collection_for_select</tt>
   # to allow filtering issues by an unassigned User or Milestone
   def unassigned_filter
@@ -32,12 +28,6 @@ module IssuesHelper
     }
   end
-  def labels_autocomplete_source
-    labels = @project.issues_labels.order('count DESC')
-    labels = labels.map{ |l| { label: l.name, value: l.name } }
-    labels.to_json
-  end
-
   def issues_active_milestones
     @project.milestones.active.order("id desc").all
   end
@@ -88,19 +78,4 @@ module IssuesHelper
       ""
     end
   end
-
-  def label_css_class(name)
-    case name
-    when *warning_labels
-      'label-warning'
-    when *neutral_labels
-      'label-inverse'
-    when *positive_labels
-      'label-success'
-    when *important_labels
-      'label-important'
-    else
-      'label-info'
-    end
-  end
 end
@@ -0,0 +1,28 @@
+module LabelsHelper
+  def issue_tags
+    @project.issues.tag_counts_on(:labels).map(&:name)
+  end
+
+  def labels_autocomplete_source
+    labels = @project.issues_labels
+    labels = labels.map{ |l| { label: l.name, value: l.name } }
+    labels.to_json
+  end
+
+  def label_css_class(name)
+    klass = Gitlab::IssuesLabels
+
+    case name
+    when *klass.warning_labels
+      'label-warning'
+    when *klass.neutral_labels
+      'label-inverse'
+    when *klass.positive_labels
+      'label-success'
+    when *klass.important_labels
+      'label-important'
+    else
+      'label-info'
+    end
+  end
+end
@@ -34,7 +34,7 @@ class Project &lt; ActiveRecord::Base
   attr_accessible :namespace_id, :creator_id, as: :admin
-  acts_as_taggable_on :labels
+  acts_as_taggable_on :labels, :issues_default_labels
   attr_accessor :import_url
@@ -204,7 +204,7 @@ class Project &lt; ActiveRecord::Base
   end
   def issues_labels
-    issues.tag_counts_on(:labels)
+    @issues_labels ||= (issues_default_labels + issues.tags_on(:labels)).uniq.sort_by(&:name)
   end
   def issue_exists?(issue_id)
@@ -47,7 +47,7 @@
     .pull-right
       - @issue.labels.each do |label|
-        %span.label
+        %span{class: "label #{label_css_class(label.name)}"}
           %i.icon-tag
           = label.name
         &nbsp;
+- frequency = @project.issues.tagged_with(label.name).count
 %li
   %strong
-    %i.icon-tag
-    = label.name
+    %span{class: "label #{label_css_class(label.name)}"}
+      %i.icon-tag
+    - if frequency.zero?
+      %span.light= label.name
+    - else
+      = label.name
   .pull-right
-    = link_to project_issues_path(label_name: label.name) do
-      %strong
-        = pluralize(label.count, 'issue')
-        = "»"
+    - unless frequency.zero?
+      = link_to project_issues_path(label_name: label.name) do
+        %strong
+          = pluralize(frequency, 'issue')
+          = "»"
@@ -4,12 +4,11 @@
   Labels
 %br
-.light-well
+- if @labels.present?
   %ul.bordered-list.labels-table
     - @labels.each do |label|
       = render 'label', label: label
-    - unless @labels.present?
-      %li
-        %h3.nothing_here_message Add first label to your issues or #{link_to 'generate', generate_project_labels_path(@project), method: :post} default set of labels
-
+- else
+  .light-well
+    %h3.nothing_here_message Add first label to your issues or #{link_to 'generate', generate_project_labels_path(@project), method: :post} default set of labels
@@ -0,0 +1,28 @@
+module Gitlab
+  class IssuesLabels
+    class << self
+      def important_labels
+        %w(bug critical confirmed)
+      end
+
+      def warning_labels
+        %w(documentation support)
+      end
+
+      def neutral_labels
+        %w(discussion suggestion)
+      end
+
+      def positive_labels
+        %w(feature enhancement)
+      end
+
+      def generate(project)
+        labels = important_labels + warning_labels + neutral_labels + positive_labels
+
+        project.issues_default_label_list = labels
+        project.save
+      end
+    end
+  end
+end
@@ -1,29 +0,0 @@
-module Gitlab
-  class Labels
-    class << self
-      def important_labels
-        %w(bug critical confirmed)
-      end
-
-      def warning_labels
-        %w(documentation support)
-      end
-
-      def neutral_labels
-        %w(discussion suggestion)
-      end
-
-      def positive_labels
-        %w(feature enhancement)
-      end
-
-      def self.generate(project)
-        labels = important_labels + warning_labels + neutral_labels + positive_labels
-
-        labels.each do |label_name|
-          # create tag for project
-        end
-      end
-    end
-  end
-end
	@@ -7,11 +7,11 @@ class LabelsController < ProjectResourceController		@@ -7,11 +7,11 @@ class LabelsController < ProjectResourceController
7	respond_to :js, :html	7	respond_to :js, :html
8		8
9	def index	9	def index
10	- @labels = @project.issues_labels.order('count DESC')	10	+ @labels = @project.issues_labels
11	end	11	end
12		12
13	def generate	13	def generate
14	- Gitlab::Labels.generate(@project)	14	+ Gitlab::IssuesLabels.generate(@project)
15		15
16	redirect_to project_labels_path(@project)	16	redirect_to project_labels_path(@project)
17	end	17	end
	@@ -11,10 +11,6 @@ module IssuesHelper		@@ -11,10 +11,6 @@ module IssuesHelper
11	classes	11	classes
12	end	12	end
13		13
14	- def issue_tags
15	- @project.issues.tag_counts_on(:labels).map(&:name)
16	- end
17	-
18	# Returns an OpenStruct object suitable for use by <tt>options_from_collection_for_select</tt>	14	# Returns an OpenStruct object suitable for use by <tt>options_from_collection_for_select</tt>
19	# to allow filtering issues by an unassigned User or Milestone	15	# to allow filtering issues by an unassigned User or Milestone
20	def unassigned_filter	16	def unassigned_filter
	@@ -32,12 +28,6 @@ module IssuesHelper		@@ -32,12 +28,6 @@ module IssuesHelper
32	}	28	}
33	end	29	end
34		30
35	- def labels_autocomplete_source
36	- labels = @project.issues_labels.order('count DESC')
37	- labels = labels.map{ \|l\| { label: l.name, value: l.name } }
38	- labels.to_json
39	- end
40	-
41	def issues_active_milestones	31	def issues_active_milestones
42	@project.milestones.active.order("id desc").all	32	@project.milestones.active.order("id desc").all
43	end	33	end
	@@ -88,19 +78,4 @@ module IssuesHelper		@@ -88,19 +78,4 @@ module IssuesHelper
88	""	78	""
89	end	79	end
90	end	80	end
91	-
92	- def label_css_class(name)
93	- case name
94	- when *warning_labels
95	- 'label-warning'
96	- when *neutral_labels
97	- 'label-inverse'
98	- when *positive_labels
99	- 'label-success'
100	- when *important_labels
101	- 'label-important'
102	- else
103	- 'label-info'
104	- end
105	- end
106	end	81	end
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+module LabelsHelper
	2	+ def issue_tags
	3	+ @project.issues.tag_counts_on(:labels).map(&:name)
	4	+ end
	5	+
	6	+ def labels_autocomplete_source
	7	+ labels = @project.issues_labels
	8	+ labels = labels.map{ \|l\| { label: l.name, value: l.name } }
	9	+ labels.to_json
	10	+ end
	11	+
	12	+ def label_css_class(name)
	13	+ klass = Gitlab::IssuesLabels
	14	+
	15	+ case name
	16	+ when *klass.warning_labels
	17	+ 'label-warning'
	18	+ when *klass.neutral_labels
	19	+ 'label-inverse'
	20	+ when *klass.positive_labels
	21	+ 'label-success'
	22	+ when *klass.important_labels
	23	+ 'label-important'
	24	+ else
	25	+ 'label-info'
	26	+ end
	27	+ end
	28	+end
	@@ -34,7 +34,7 @@ class Project < ActiveRecord::Base		@@ -34,7 +34,7 @@ class Project < ActiveRecord::Base
34		34
35	attr_accessible :namespace_id, :creator_id, as: :admin	35	attr_accessible :namespace_id, :creator_id, as: :admin
36		36
37	- acts_as_taggable_on :labels	37	+ acts_as_taggable_on :labels, :issues_default_labels
38		38
39	attr_accessor :import_url	39	attr_accessor :import_url
40		40
	@@ -204,7 +204,7 @@ class Project < ActiveRecord::Base		@@ -204,7 +204,7 @@ class Project < ActiveRecord::Base
204	end	204	end
205		205
206	def issues_labels	206	def issues_labels
207	- issues.tag_counts_on(:labels)	207	+ @issues_labels \|\|= (issues_default_labels + issues.tags_on(:labels)).uniq.sort_by(&:name)
208	end	208	end
209		209
210	def issue_exists?(issue_id)	210	def issue_exists?(issue_id)
	@@ -47,7 +47,7 @@		@@ -47,7 +47,7 @@
47		47
48	.pull-right	48	.pull-right
49	- @issue.labels.each do \|label\|	49	- @issue.labels.each do \|label\|
50	- %span.label	50	+ %span{class: "label #{label_css_class(label.name)}"}
51	%i.icon-tag	51	%i.icon-tag
52	= label.name	52	= label.name
53		53
		1	+- frequency = @project.issues.tagged_with(label.name).count
1	%li	2	%li
2	%strong	3	%strong
3	- %i.icon-tag
4	- = label.name	4	+ %span{class: "label #{label_css_class(label.name)}"}
		5	+ %i.icon-tag
		6	+ - if frequency.zero?
		7	+ %span.light= label.name
		8	+ - else
		9	+ = label.name
5	.pull-right	10	.pull-right
6	- = link_to project_issues_path(label_name: label.name) do
7	- %strong
8	- = pluralize(label.count, 'issue')
9	- = "»"	11	+ - unless frequency.zero?
		12	+ = link_to project_issues_path(label_name: label.name) do
		13	+ %strong
		14	+ = pluralize(frequency, 'issue')
		15	+ = "»"
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+module Gitlab
	2	+ class IssuesLabels
	3	+ class << self
	4	+ def important_labels
	5	+ %w(bug critical confirmed)
	6	+ end
	7	+
	8	+ def warning_labels
	9	+ %w(documentation support)
	10	+ end
	11	+
	12	+ def neutral_labels
	13	+ %w(discussion suggestion)
	14	+ end
	15	+
	16	+ def positive_labels
	17	+ %w(feature enhancement)
	18	+ end
	19	+
	20	+ def generate(project)
	21	+ labels = important_labels + warning_labels + neutral_labels + positive_labels
	22	+
	23	+ project.issues_default_label_list = labels
	24	+ project.save
	25	+ end
	26	+ end
	27	+ end
	28	+end
	@@ -1,29 +0,0 @@	@@ -1,29 +0,0 @@
1	-module Gitlab
2	- class Labels
3	- class << self
4	- def important_labels
5	- %w(bug critical confirmed)
6	- end
7	-
8	- def warning_labels
9	- %w(documentation support)
10	- end
11	-
12	- def neutral_labels
13	- %w(discussion suggestion)
14	- end
15	-
16	- def positive_labels
17	- %w(feature enhancement)
18	- end
19	-
20	- def self.generate(project)
21	- labels = important_labels + warning_labels + neutral_labels + positive_labels
22	-
23	- labels.each do \|label_name\|
24	- # create tag for project
25	- end
26	- end
27	- end
28	- end
29	-end