taxons_controller.rb in spree_backend-4.4.0.rc1

- old
+ new

@@ -1,32 +1,15 @@
 module Spree
   module Admin
-    class TaxonsController < Spree::Admin::BaseController
-      before_action :load_taxonomy, only: [:create, :edit, :update, :remove_icon]
-      before_action :load_taxon, only: [:edit, :update, :remove_icon]
-      before_action :set_permalink_part, only: [:edit, :update]
+    class TaxonsController < ResourceController
+      belongs_to 'spree/taxonomy'
+
+      before_action :set_permalink_part, only: [:edit]
       respond_to :html, :js
 
       def index; end
 
-      def create
-        @taxon = @taxonomy.taxons.build(params[:taxon].except(:icon))
-        @taxon.build_icon(attachment: taxon_params[:icon])
-        if @taxon.save
-          respond_with(@taxon) do |format|
-            format.json { render json: @taxon.to_json }
-          end
-        else
-          flash[:error] = Spree.t('errors.messages.could_not_create_taxon')
-          respond_with(@taxon) do |format|
-            format.html { redirect_to @taxonomy ? edit_admin_taxonomy_url(@taxonomy) : admin_taxonomies_url }
-          end
-        end
-      end
-
-      def edit; end
-
       def update
         successful = @taxon.transaction do
           parent_id = params[:taxon][:parent_id]
           set_position
           set_parent(parent_id)
@@ -49,64 +32,66 @@
 
           # rename child taxons
           rename_child_taxons if @update_children
 
           respond_with(@taxon) do |format|
-            format.html { redirect_to spree.edit_admin_taxonomy_url(@taxonomy) }
+            format.html { redirect_to spree.edit_admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id) }
             format.json { render json: @taxon.to_json }
           end
         else
           respond_with(@taxon) do |format|
-            format.html { render :edit }
-            format.json { render json: @taxon.errors.full_messages.to_sentence, status: 422 }
+            format.html { render :edit, status: :unprocessable_entity }
+            format.json { render json: @taxon.errors.full_messages.to_sentence, status: :unprocessable_entity }
           end
         end
       end
 
       def remove_icon
         if @taxon.icon.destroy
           flash[:success] = Spree.t('notice_messages.icon_removed')
           redirect_to spree.edit_admin_taxonomy_taxon_url(@taxonomy.id, @taxon.id)
         else
           flash[:error] = Spree.t('errors.messages.cannot_remove_icon')
-          render :edit
+          render :edit, status: :unprocessable_entity
         end
       end
 
       private
 
+      def location_after_save
+        spree.edit_admin_taxonomy_taxon_path(@taxonomy.id, @taxon.id)
+      end
+
+      def parent_data
+        if action_name == 'index'
+          nil
+        else
+          super
+        end
+      end
+
       def set_permalink_part
         @permalink_part = @taxon.permalink.split('/').last
         @parent_permalink = @taxon.permalink.split('/')[0...-1].join('/')
         @parent_permalink += '/' unless @parent_permalink.blank?
       end
 
       def taxon_params
         params.require(:taxon).permit(permitted_taxon_attributes)
       end
 
-      def load_taxon
-        @taxon = @taxonomy.taxons.find(params[:id])
-      end
-
-      def load_taxonomy
-        @taxonomy = if defined?(SpreeGlobalize)
-                      scope.includes(:translations, taxons: [:translations]).find(params[:taxonomy_id])
-                    else
-                      scope.find(params[:taxonomy_id])
-                    end
-      end
-
       def set_position
         new_position = params[:taxon][:position]
         @taxon.child_index = new_position.to_i if new_position
       end
 
       def set_parent(parent_id)
-        @taxon.parent = current_store.taxons.find(parent_id.to_i) if parent_id
+        @taxon.parent = current_store.taxons.find(parent_id) if parent_id
       end
 
       def set_permalink_params
+        set_permalink_part
+
         if params.key? 'permalink_part'
           params[:taxon][:permalink] = @parent_permalink + params[:permalink_part]
         end
       end
 