fix: any

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

diff --git a/app/controllers/sheets_controller.rb b/app/controllers/sheets_controller.rb
index f0a1455..0aa475a 100644 (file)
--- a/app/controllers/sheets_controller.rb
+++ b/app/controllers/sheets_controller.rb
@@ -1,13 +1,13 @@
 class SheetsController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
-    before_filter :authenticate_reader, :only => [
+    before_action :authenticate_reader, :only => [
       :index, :show, :play, :by_story, :by_panel, :by_author
     ]
-    before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
   
   def index
@@ -15,24 +15,24 @@ class SheetsController < ApplicationController
   end
   
   def by_story
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_panel
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_author
-    filer_list
+    filer_list param: params[:id]
   end
   
   def show_html_format format
     format.html {
       if @operators.author
-        @new_panel_items = assist_items('home', 'panels')
+        @new_panel_items = assist_items('home', 'panels', finder: :find_private, param: @operators)
         
-        @new_story_items = assist_items('home', 'stories')
-        @fresh_story_items = assist_items('home', 'story_sheets').map {|ss| ss.story}
+        @new_story_items = assist_items('home', 'stories', finder: :find_private, param: @operators)
+        @fresh_story_items = assist_items('home', 'story_sheets', finder: :find_private, param: @operators).map {|ss| ss.story}
       end
     }
   end
@@ -48,16 +48,15 @@ class SheetsController < ApplicationController
   
   def play
     set_play
-    @list.options.merge!({'page_size' => -1})    # no limit no pager
-    @list.reset
+    @finder.per(-1)    # no limit no pager
     play_list
     respond_to do |format|
       format.html {
-        if @operators.author
-          @new_panel_items = assist_items('home', 'panels')
+        if @item.own? @operators
+          @new_panel_items = assist_items('home', 'panels', finder: :find_private, param: @operators)
         end
       }
-      list_json_format @list, format
+      list_json_format @finder, format
     end
   end
   
@@ -102,11 +101,11 @@ class SheetsController < ApplicationController
     set_model
     @item = @my_model_class.new
     @item.supply_default 
-    jsn = nil
-    if params[:json]
-      jsn = JSON.parse_no_except(params[:json])
+    @prm = if params[:json]
+      JSON.parse_no_except(params[:json])
+    else
+      @item.permit_params params
     end
-    @prm = params[:sheet] || jsn
     
     respond_to do |format|
       if @item.store @prm, @operators
@@ -122,10 +121,11 @@ class SheetsController < ApplicationController
   def update
     set_edit
     jsn = nil
-    if params[:json]
-      jsn = JSON.parse(params[:json])
+    @prm = if params[:json]
+      JSON.parse(params[:json])
+    else
+      @item.permit_params params
     end
-    @prm = params[:sheet] || jsn
     respond_to do |format|
       if @item.store @prm, @operators
         updated_html_format format