X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fcontrollers%2Fground_colors_controller.rb;h=c9be0d39948e2c3a55291a7538b6258ec5fc38d6;hp=78c03b44a0125281dbdd0493e22ef1ff9262e5bf;hb=d7c8065be895b67dc453b0e11ad0f259f1ca6706;hpb=0dc24d97764947af06c60aeb3ee4dfcbf8ed55b1 diff --git a/app/controllers/ground_colors_controller.rb b/app/controllers/ground_colors_controller.rb index 78c03b44..c9be0d39 100644 --- a/app/controllers/ground_colors_controller.rb +++ b/app/controllers/ground_colors_controller.rb @@ -1,13 +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 => [] + before_action :authenticate_user, :only => [] + before_action :authenticate_author, :only => [] end def index @@ -15,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 @@ -37,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