Move the #toggle_subscription controller method to a concern

1 files changed, 8 insertions, 10 deletions

diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb
index e4dea6b065a..40d8098690a 100644
--- a/app/controllers/projects/labels_controller.rb
+++ b/app/controllers/projects/labels_controller.rb
@@ -1,8 +1,12 @@
 class Projects::LabelsController < Projects::ApplicationController
+  include ToggleSubscriptionAction
+
   before_action :module_enabled
-  before_action :label, only: [:edit, :update, :destroy, :toggle_subscription]
+  before_action :label, only: [:edit, :update, :destroy]
   before_action :authorize_read_label!
-  before_action :authorize_admin_labels!, except: [:index, :toggle_subscription]
+  before_action :authorize_admin_labels!, only: [
+    :new, :create, :edit, :update, :generate, :destroy
+  ]
 
   respond_to :js, :html
 
@@ -60,13 +64,6 @@ class Projects::LabelsController < Projects::ApplicationController
     end
   end
 
-  def toggle_subscription
-    return unless current_user
-
-    @label.toggle_subscription(current_user)
-    render nothing: true
-  end
-
   protected
 
   def module_enabled
@@ -80,8 +77,9 @@ class Projects::LabelsController < Projects::ApplicationController
   end
 
   def label
-    @label = @project.labels.find(params[:id])
+    @label ||= @project.labels.find(params[:id])
   end
+  alias_method :subscribable_resource, :label
 
   def authorize_admin_labels!
     return render_404 unless can?(current_user, :admin_label, @project)