X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fspeech_balloon_templates_controller.rb;h=574bb5ac9c45790c9c1a6e942406125d5b2b5a94;hb=2788400e911d92496bf76bbae44021353b287ba0;hp=2499e6e5b252fb55356e610476b107b6e60130aa;hpb=ea14998dcdc4eda196bcb920b17b6653710e97ba;p=pettanr%2Fpettanr.git diff --git a/app/controllers/speech_balloon_templates_controller.rb b/app/controllers/speech_balloon_templates_controller.rb index 2499e6e5..574bb5ac 100644 --- a/app/controllers/speech_balloon_templates_controller.rb +++ b/app/controllers/speech_balloon_templates_controller.rb @@ -1,24 +1,24 @@ class SpeechBalloonTemplatesController < ApplicationController if Manifest.manifest.magic_numbers['run_mode'] == 0 - before_filter :authenticate_user, :only => [] + before_action :authenticate_user, :only => [] else - before_filter :authenticate_reader, :only => [ + before_action :authenticate_reader, :only => [ :index, :show, :by_panel, :by_system_picture ] - before_filter :authenticate_user, :only => [] + before_action :authenticate_user, :only => [] end - before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy] + before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy] def index filer_list end def by_panel - filer_list + filer_list param: params[:id] end def by_system_picture - filer_list + filer_list param: params[:id] end def show_html_format format