Commit 71647fd5 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'feature/labels_set' of /home/git/repositories/gitlab/gitlabhq

parents af5d0e9e 04da04ff
...@@ -7,7 +7,13 @@ class LabelsController < ProjectResourceController ...@@ -7,7 +7,13 @@ class LabelsController < ProjectResourceController
respond_to :js, :html respond_to :js, :html
def index def index
@labels = @project.issues_labels.order('count DESC') @labels = @project.issues_labels
end
def generate
Gitlab::IssuesLabels.generate(@project)
redirect_to project_labels_path(@project)
end end
protected protected
......
...@@ -11,10 +11,6 @@ module IssuesHelper ...@@ -11,10 +11,6 @@ module IssuesHelper
classes classes
end 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> # 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 # to allow filtering issues by an unassigned User or Milestone
def unassigned_filter def unassigned_filter
...@@ -32,12 +28,6 @@ module IssuesHelper ...@@ -32,12 +28,6 @@ module IssuesHelper
} }
end 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 def issues_active_milestones
@project.milestones.active.order("id desc").all @project.milestones.active.order("id desc").all
end end
......
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 < ActiveRecord::Base ...@@ -34,7 +34,7 @@ class Project < ActiveRecord::Base
attr_accessible :namespace_id, :creator_id, as: :admin 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 attr_accessor :import_url
...@@ -204,7 +204,7 @@ class Project < ActiveRecord::Base ...@@ -204,7 +204,7 @@ class Project < ActiveRecord::Base
end end
def issues_labels def issues_labels
issues.tag_counts_on(:labels) @issues_labels ||= (issues_default_labels + issues.tags_on(:labels)).uniq.sort_by(&:name)
end end
def issue_exists?(issue_id) def issue_exists?(issue_id)
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
.issue-labels .issue-labels
- issue.labels.each do |label| - issue.labels.each do |label|
%span.label.label-info %span{class: "label #{label_css_class(label.name)}"}
%i.icon-tag %i.icon-tag
= label.name = label.name
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
.pull-right .pull-right
- @issue.labels.each do |label| - @issue.labels.each do |label|
%span.label %span{class: "label #{label_css_class(label.name)}"}
%i.icon-tag %i.icon-tag
= label.name = label.name
&nbsp; &nbsp;
......
- frequency = @project.issues.tagged_with(label.name).count
%li %li
%strong %strong
%span{class: "label #{label_css_class(label.name)}"}
%i.icon-tag %i.icon-tag
- if frequency.zero?
%span.light= label.name
- else
= label.name = label.name
.pull-right .pull-right
- unless frequency.zero?
= link_to project_issues_path(label_name: label.name) do = link_to project_issues_path(label_name: label.name) do
%strong %strong
= pluralize(label.count, 'issue') = pluralize(frequency, 'issue')
= "»" = "»"
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
%h3.page_title %h3.page_title
Labels Labels
%br %br
%div.ui-box
%ul.well-list.labels-table - if @labels.present?
%ul.bordered-list.labels-table
- @labels.each do |label| - @labels.each do |label|
= render 'label', label: label = render 'label', label: label
- unless @labels.present? - else
%li .light-well
%h3.nothing_here_message Nothing to show here %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
...@@ -269,7 +269,13 @@ Gitlab::Application.routes.draw do ...@@ -269,7 +269,13 @@ Gitlab::Application.routes.draw do
resources :team, controller: 'team_members', only: [:index] resources :team, controller: 'team_members', only: [:index]
resources :milestones, except: [:destroy] resources :milestones, except: [:destroy]
resources :labels, only: [:index]
resources :labels, only: [:index] do
collection do
post :generate
end
end
resources :issues, except: [:destroy] do resources :issues, except: [:destroy] do
collection do collection do
post :bulk_update post :bulk_update
......
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
...@@ -485,9 +485,9 @@ describe Gitlab::API do ...@@ -485,9 +485,9 @@ describe Gitlab::API do
response.status.should == 200 response.status.should == 200
end end
it "should return a 400 error if hook id not given" do it "should return a 405 error if hook id not given" do
delete api("/projects/#{project.id}/hooks", user) delete api("/projects/#{project.id}/hooks", user)
response.status.should == 400 response.status.should == 405
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment