Cleanup controllers with moveable concern

Author: chaimann

admin/app/controllers/solidus_admin/option_types_controller.rb

@@ -2,15 +2,7 @@
 
 module SolidusAdmin
   class OptionTypesController < SolidusAdmin::ResourcesController
-    before_action :load_option_type, only: [:move]
-
-    def move
-      @option_type.insert_at(params[:position].to_i)
-
-      respond_to do |format|
-        format.js { head :no_content }
-      end
-    end
+    include SolidusAdmin::Moveable
 
     private
 
@@ -29,10 +21,5 @@ def resources_collection = Spree::OptionType.unscoped
     def resources_sorting_options
       { position: :asc }
     end
-
-    def load_option_type
-      @option_type = Spree::OptionType.find(params[:id])
-      authorize! action_name, @option_type
-    end
   end
 end

admin/app/controllers/solidus_admin/option_values_controller.rb

@@ -2,23 +2,10 @@
 
 module SolidusAdmin
   class OptionValuesController < SolidusAdmin::ResourcesController
-    before_action :load_option_value, only: [:move]
-
-    def move
-      @option_value.insert_at(params[:position].to_i)
-
-      respond_to do |format|
-        format.js { head :no_content }
-      end
-    end
+    include SolidusAdmin::Moveable
 
     private
 
     def resource_class = Spree::OptionValue
-
-    def load_option_value
-      @option_value = Spree::OptionValue.find(params[:id])
-      authorize! action_name, @option_value
-    end
   end
 end

admin/app/controllers/solidus_admin/payment_methods_controller.rb

@@ -3,8 +3,7 @@
 module SolidusAdmin
   class PaymentMethodsController < SolidusAdmin::BaseController
     include SolidusAdmin::ControllerHelpers::Search
-
-    before_action :load_payment_method, only: [:move]
+    include SolidusAdmin::Moveable
 
     search_scope(:all)
     search_scope(:active, default: true, &:active)
@@ -25,14 +24,6 @@ def index
       end
     end
 
-    def move
-      @payment_method.insert_at(params[:position].to_i)
-
-      respond_to do |format|
-        format.js { head :no_content }
-      end
-    end
-
     def destroy
       @payment_methods = Spree::PaymentMethod.where(id: params[:id])
 
@@ -41,12 +32,5 @@ def destroy
       flash[:notice] = t('.success')
       redirect_back_or_to payment_methods_path, status: :see_other
     end
-
-    private
-
-    def load_payment_method
-      @payment_method = Spree::PaymentMethod.find_by!(id: params[:id])
-      authorize! action_name, @payment_method
-    end
   end
 end

admin/app/controllers/solidus_admin/taxonomies_controller.rb

@@ -3,8 +3,7 @@
 module SolidusAdmin
   class TaxonomiesController < SolidusAdmin::BaseController
     include SolidusAdmin::ControllerHelpers::Search
-
-    before_action :load_taxonomy, only: [:move]
+    include SolidusAdmin::Moveable
 
     def index
       taxonomies = apply_search_to(
@@ -19,14 +18,6 @@ def index
       end
     end
 
-    def move
-      @taxonomy.insert_at(params[:position].to_i)
-
-      respond_to do |format|
-        format.js { head :no_content }
-      end
-    end
-
     def destroy
       @taxonomies = Spree::Taxonomy.where(id: params[:id])
 
@@ -35,12 +26,5 @@ def destroy
       flash[:notice] = t('.success')
       redirect_back_or_to taxonomies_path, status: :see_other
     end
-
-    private
-
-    def load_taxonomy
-      @taxonomy = Spree::Taxonomy.find(params[:id])
-      authorize! action_name, @taxonomy
-    end
   end
 end