pages_controller.rb in spina-1.1.0

- old
+ new

@@ -1,20 +1,21 @@
 module Spina
   module Admin
     class PagesController < AdminController
       before_action :set_tabs, only: [:new, :create, :edit, :update]
       before_action :set_locale
+      before_action :set_page, only: [:edit, :update, :destroy, :children]
 
       def index
         add_breadcrumb I18n.t('spina.website.pages'), spina.admin_pages_path
         redirect_to admin_pages_path unless current_admin_path.starts_with?('/pages')
         @pages = Page.active.sorted.roots.regular_pages
       end
 
       def new
         @resource = Resource.find_by(id: params[:resource_id])
-        @page = Page.new(resource: @resource, parent: @resource&.parent_page)
+        @page = Page.new(resource: @resource, parent: Page.find_by(id: params[:parent_id]) || @resource&.parent_page)
         add_index_breadcrumb
         if current_theme.new_page_templates.any? { |template| template[0] == params[:view_template] }
           @page.view_template = params[:view_template]
         end
         add_breadcrumb I18n.t('spina.pages.new')
@@ -32,31 +33,28 @@
           @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
           render :new, layout: 'spina/admin/admin'
         end
       end
 
-      def edit
-        @page = Page.find(params[:id])
+      def edit        
         add_index_breadcrumb
         add_breadcrumb @page.title
         @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
         render layout: 'spina/admin/admin'
       end
 
-      def update
-        I18n.locale = params[:locale] || I18n.default_locale
-        @page = Page.find(params[:id])
+      def update 
         respond_to do |format|
-          if @page.update_attributes(page_params)
-            add_breadcrumb @page.title
+          Mobility.locale = @locale
+          if @page.update(page_params)
             @page.touch
-            I18n.locale = I18n.default_locale
             format.html { redirect_to spina.edit_admin_page_url(@page, params: {locale: @locale}), flash: {success: t('spina.pages.saved')} }
             format.js
           else
             format.html do
               @page_parts = @page.view_template_page_parts(current_theme).map { |part| @page.part(part) }
+              Mobility.locale = I18n.default_locale
               render :edit, layout: 'spina/admin/admin'
             end
           end
         end
       end
@@ -67,12 +65,16 @@
           update_page_position(parent_node, parent_pos, nil)
         end
         head :ok
       end
 
-      def destroy
-        @page = Page.find(params[:id])
+      def children
+        @children = @page.children.active.sorted
+        render layout: false
+      end
+
+      def destroy        
         @page.destroy
         redirect_to spina.admin_pages_url
       end
 
       private
@@ -108,8 +110,11 @@
 
       def page_params
         params.require(:page).permit!
       end
 
+      def set_page
+        @page = Page.find(params[:id])
+      end
     end
   end
 end