X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fcontrollers%2Fpanel_pictures_controller.rb;h=d2f310b6fa179bdb9198cec6473a7b8009545580;hp=09d1f5499b95276a3dcf86b00800f5ca389b163e;hb=d7c8065be895b67dc453b0e11ad0f259f1ca6706;hpb=cb811687cd15adff98b30f841617e35b8e3ccb85

diff --git a/app/controllers/panel_pictures_controller.rb b/app/controllers/panel_pictures_controller.rb
index 09d1f549..d2f310b6 100644
--- a/app/controllers/panel_pictures_controller.rb
+++ b/app/controllers/panel_pictures_controller.rb
@@ -1,17 +1,13 @@
 class PanelPicturesController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_user, :only => []
-    before_filter :authenticate_author, :only => []
+    before_action :authenticate_user, :only => []
+    before_action :authenticate_author, :only => []
   else
-    before_filter :authenticate_reader, :only => [
-      :index, :show, :by_panel, :by_author, :count, :count_by_panel, :count_by_author
+    before_action :authenticate_reader, :only => [
+      :index, :show, :by_panel, :by_author
     ]
-    before_filter :authenticate_user, :only => []
-    before_filter :authenticate_author, :only => []
-  end
-  
-  def self.model
-    PanelPicture
+    before_action :authenticate_user, :only => []
+    before_action :authenticate_author, :only => []
   end
   
   def index
@@ -19,11 +15,11 @@ class PanelPicturesController < ApplicationController
   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
@@ -41,16 +37,4 @@ class PanelPicturesController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
 end