Improve labels

* allow developers to manage labels
* add ability to remove label

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

1 files changed, 9 insertions, 4 deletions

diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index 4d0723a26df..14194b3963c 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -1,18 +1,17 @@
 class Projects::LabelsController < Projects::ApplicationController
   before_filter :module_enabled
-  before_filter :label, only: [:edit, :update]
+  before_filter :label, only: [:edit, :update, :destroy]
   before_filter :authorize_labels!
-  before_filter :authorize_admin_labels!, only: [:edit, :update, :new, :create, :destroy]
+  before_filter :authorize_admin_labels!, except: [:index]
 
   respond_to :js, :html
 
   def index
-    @labels = @project.labels
+    @labels = @project.labels.order('title ASC').page(params[:page]).per(20)
   end
 
   def new
     @label = @project.labels.new
-
   end
 
   def create
@@ -48,6 +47,12 @@ class Projects::LabelsController < Projects::ApplicationController
     end
   end
 
+  def destroy
+    @label.destroy
+
+    redirect_to project_labels_path(@project), notice: 'Label was removed'
+  end
+
   protected
 
   def module_enabled