X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fground_colors_controller.rb;h=c9be0d39948e2c3a55291a7538b6258ec5fc38d6;hb=2788400e911d92496bf76bbae44021353b287ba0;hp=168bda309b43a9db21e9bc862f690b2c39410cdc;hpb=515770f9e8ad42c5c18c4718c357e0b214f3c654;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/ground_colors_controller.rb b/app/controllers/ground_colors_controller.rb
index 168bda30..c9be0d39 100644
--- a/app/controllers/ground_colors_controller.rb
+++ b/app/controllers/ground_colors_controller.rb
@@ -1,17 +1,13 @@
 class GroundColorsController < 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
-    GroundColor
+    before_action :authenticate_user, :only => []
+    before_action :authenticate_author, :only => []
   end
   
   def index
@@ -19,11 +15,11 @@ class GroundColorsController < 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 GroundColorsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
 end