fix: any

[pettanr/pettanr.git] / app / controllers / panels_controller.rb

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index 8d5d44b..70d8d5d 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -1,24 +1,23 @@
 class PanelsController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy, :catch]
-    before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy, :catch]
+    before_action :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
   else
-    before_filter :authenticate_reader, :only => [
+    before_action :authenticate_reader, :only => [
       :index, :show, :by_scroll, :by_sheet, :by_author, :by_speech_balloon_template
     ]
-    before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy, :catch]
-    before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy, :catch]
+    before_action :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
   end
   
   private
   def panel_list
     set_list
-    list_result = @list.open(@operators)
-    @items = list_result.items 
-    @pager = list_result.paginate
+    @items = @finder
+    @pager = @finder
     respond_to do |format|
       format.html 
-      format.json { render json: @items.map{|i| i.attributes}.to_json }
+      list_json_format @finder, format
       format.atom 
       format.rss
     end
@@ -33,26 +32,26 @@ class PanelsController < ApplicationController
   end
   
   def by_scroll
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_sheet
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_author
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_speech_balloon_template
-    filer_list
+    filer_list param: params[:id]
   end
   
   def show_html_format format
     format.html {
       if @operators.author
-        @new_scroll_items = assist_items('home', 'scrolls')
-        @fresh_scroll_items = assist_items('home', 'scroll_panels').map {|sp| sp.scroll}
+        @new_scroll_items = assist_items('home', 'scrolls', finder: :find_private, param: @operators)
+        @fresh_scroll_items = assist_items('home', 'scroll_panels', finder: :find_private, param: @operators).map {|sp| sp.scroll}
       end
     }
   end
@@ -70,6 +69,7 @@ class PanelsController < ApplicationController
     end
   end
   
+=begin
   def new
     set_new
     respond_to do |format|
@@ -95,6 +95,15 @@ class PanelsController < ApplicationController
       format.json { render json: @item.to_json }
     end
   end
+=end
+  
+  def new
+    form_new
+  end
+  
+  def edit
+    form_edit
+  end
   
   def create
     set_model
@@ -105,9 +114,9 @@ class PanelsController < ApplicationController
       jsn = JSON.parse_no_except(params[:json])
     end
     @prm = if params[:panel] == nil or params[:panel].empty?
-       jsn
+      jsn
     else
-       params[:panel]
+      @item.permit_params(params)
     end
     @item.class.fold_extend_settings @prm
     #@item.refresh
@@ -116,13 +125,7 @@ class PanelsController < ApplicationController
         created_html_format format
         created_json_format format
       else
-        format.html {
-          flash[:notice] = I18n.t('flash.notice.not_created', :model => @my_model_class.model_name.human)
-          @editor = Editor::PanelEditor.new @item, @operators
-          render :template => @editor.template_name, :locals => {
-            :editor => @editor
-          }
-        }
+        not_created_html_format format
         not_created_json_format format
       end
     end
@@ -135,54 +138,28 @@ class PanelsController < ApplicationController
     if params[:json]
       jsn = JSON.parse(params[:json])
     end
-    @prm = params[:panel] || jsn
-    self.model.fold_extend_settings @prm
-    @item.attributes = @prm
-    @item.refresh
+    @prm = if params[:panel] == nil or params[:panel].empty?
+      jsn
+    else
+      @item.permit_params(params)
+    end
+    @item.class.fold_extend_settings @prm
+    # @item.refresh
     respond_to do |format|
-      if @item.store @item.packed_attributes, @operators
+      if @item.store @prm, @operators
         updated_html_format format
         updated_json_format format
       else
-        format.html {
-          flash[:notice] = I18n.t('flash.notice.not_updated', :model => @my_model_class.model_name.human)
-          @editor = Editor::PanelEditor.new @item, @operators
-          render :template => @editor.template_name, :locals => {
-            :editor => @editor
-          }
-        }
+        not_updated_html_format format
         not_updated_json_format format
       end
     end
   end
   
   def destroy
-    @item = Panel.edit(params[:id], @operators)
-    respond_to do |format|
-      Panel.transaction do
-        if @item.destroy_with_elements
-          flash[:notice] = I18n.t('flash.notice.destroyed', :model => Panel.model_name.human)
-          format.html { redirect_to '/home/panels' }
-          format.json { head :ok }
-        else
-          flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => Panel.model_name.human)
-          format.html { redirect_to @item }
-          format.json { render json: @item.errors, status: :unprocessable_entity }
-        end
-      end
-    end
+    set_model
+    @item = @my_model_class.edit(params[:id], @operators)
+    render_destroy '/home/' + @item.path_name
   end
   
-  def catch
-    @item = Panel.edit(params[:id], @operators)
-
-    respond_to do |format|
-      @operators.author.working_panel_id = @item.id
-      if @operators.author.save
-        format.html { redirect_to @item }
-      else
-      end
-    end
-  end
-
 end