rails upgrade to 4

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

diff --git a/app/controllers/resource_picture_pictures_controller.rb b/app/controllers/resource_picture_pictures_controller.rb
index 8a0ddc3..eb08b00 100644 (file)
--- a/app/controllers/resource_picture_pictures_controller.rb
+++ b/app/controllers/resource_picture_pictures_controller.rb
@@ -1,9 +1,9 @@
 class ResourcePicturePicturesController < 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 => [:index, :show, :by_original_picture, :by_resource_picture, :by_picture]
-    before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_reader, :only => [:index, :show, :by_original_picture, :by_resource_picture, :by_picture]
+    before_action :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
   end
   
   def index