diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-30 19:13:35 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-07-30 19:13:35 +0300 |
| commit | 2ecc79507a4a9556f6f609c7289b7b0942ccc6bb (patch) | |
| tree | 08e52d2656da5e6a06542e422346bb5fcce7be85 | |
| parent | 91c1534e59c0492546c46724f9d401c40e1c9133 (diff) | |
| download | gitlab-ce-2ecc79507a4a9556f6f609c7289b7b0942ccc6bb.tar.gz | |
Order labels by name
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| -rw-r--r-- | app/controllers/projects/labels_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/label.rb | 2 | ||||
| -rw-r--r-- | app/views/shared/_project_filter.html.haml | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index 14194b3963c..d049012f6d8 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -7,7 +7,7 @@ class Projects::LabelsController < Projects::ApplicationController respond_to :js, :html def index - @labels = @project.labels.order('title ASC').page(params[:page]).per(20) + @labels = @project.labels.order_by_name.page(params[:page]).per(20) end def new diff --git a/app/models/label.rb b/app/models/label.rb index 5d6e5e91a0c..ce982579675 100644 --- a/app/models/label.rb +++ b/app/models/label.rb @@ -9,6 +9,8 @@ class Label < ActiveRecord::Base # Dont allow '?', '&', and ',' for label titles validates :title, presence: true, format: { with: /\A[^&\?,&]*\z/ } + scope :order_by_name, -> { reorder("labels.title ASC") } + def name title end diff --git a/app/views/shared/_project_filter.html.haml b/app/views/shared/_project_filter.html.haml index 21d45ebe806..4e989eca1a4 100644 --- a/app/views/shared/_project_filter.html.haml +++ b/app/views/shared/_project_filter.html.haml @@ -36,7 +36,7 @@ %fieldset %legend Labels %ul.nav.nav-pills.nav-stacked.nav-small.labels-filter - - @project.labels.each do |label| + - @project.labels.order_by_name.each do |label| %li{class: label_filter_class(label.name)} = link_to labels_filter_path(label.name) do = render_colored_label(label) |