rails upgrade to 4

[pettanr/pettanr.git] / app / controllers / folders_controller.rb

diff --git a/app/controllers/folders_controller.rb b/app/controllers/folders_controller.rb
index f535d7a..73623fa 100644 (file)
--- a/app/controllers/folders_controller.rb
+++ b/app/controllers/folders_controller.rb
@@ -1,9 +1,9 @@
 class FoldersController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
   else
-    before_filter :authenticate_reader, :only => [:root, :index, :show, :watch]
-    before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_reader, :only => [:root, :index, :show, :watch]
+    before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
   end
   
   def root