Showing
6 changed files
with
9 additions
and
9 deletions
| 1 | module Kanjai | 1 | module Kanjai |
| 2 | class Admin::PagesController < AdminController | 2 | class Admin::PagesController < AdminController |
| 3 | 3 | ||
| 4 | - before_filter :get_page_list, :only => [:new, :create] | ||
| 5 | - before_filter :get_page_list_without_current, :only => [:edit, :update] | 4 | + before_action :get_page_list, :only => [:new, :create] |
| 5 | + before_action :get_page_list_without_current, :only => [:edit, :update] | ||
| 6 | 6 | ||
| 7 | def new | 7 | def new |
| 8 | @page = Page.new | 8 | @page = Page.new |
| @@ -6,9 +6,9 @@ module Kanjai | @@ -6,9 +6,9 @@ module Kanjai | ||
| 6 | 6 | ||
| 7 | protect_from_forgery | 7 | protect_from_forgery |
| 8 | 8 | ||
| 9 | - before_filter :authenticate_admin_user! | 9 | + before_action :authenticate_admin_user! |
| 10 | 10 | ||
| 11 | - before_filter :set_locale | 11 | + before_action :set_locale |
| 12 | 12 | ||
| 13 | private | 13 | private |
| 14 | 14 |
| 1 | module Kanjai | 1 | module Kanjai |
| 2 | class ApplicationController < ::ApplicationController#ActionController::Base | 2 | class ApplicationController < ::ApplicationController#ActionController::Base |
| 3 | - before_filter :instantiate_controller_and_action_names | 3 | + before_action :instantiate_controller_and_action_names |
| 4 | 4 | ||
| 5 | def instantiate_controller_and_action_names | 5 | def instantiate_controller_and_action_names |
| 6 | @current_action = action_name | 6 | @current_action = action_name |
| @@ -4,8 +4,8 @@ module Kanjai | @@ -4,8 +4,8 @@ module Kanjai | ||
| 4 | 4 | ||
| 5 | #protect_from_forgery | 5 | #protect_from_forgery |
| 6 | 6 | ||
| 7 | - before_filter :define_locale | ||
| 8 | - before_filter :get_page | 7 | + before_action :define_locale |
| 8 | + before_action :get_page | ||
| 9 | 9 | ||
| 10 | include Kanjai::ContentFunction | 10 | include Kanjai::ContentFunction |
| 11 | 11 |