rails upgrade to 4

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

diff --git a/app/controllers/resource_pictures_controller.rb b/app/controllers/resource_pictures_controller.rb
index 27b1b31..60972c4 100644 (file)
--- a/app/controllers/resource_pictures_controller.rb
+++ b/app/controllers/resource_pictures_controller.rb
@@ -1,14 +1,14 @@
 class ResourcePicturesController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_user, :only => [:new, :create, :update, :destroy]
-    before_filter :authenticate_artist, :only => [:new, :create, :update, :destroy]
+    before_action :authenticate_user, :only => [:new, :create, :update, :destroy]
+    before_action :authenticate_artist, :only => [:new, :create, :update, :destroy]
   else
-    before_filter :authenticate_resource_reader, :only => [
+    before_action :authenticate_resource_reader, :only => [
       :index, :show, :credit, 
       :by_original_picture, :by_license_group, :by_license, :by_artist
     ]
-    before_filter :authenticate_user, :only => [:new, :create, :update, :destroy]
-    before_filter :authenticate_artist, :only => [:new, :create, :update, :destroy]
+    before_action :authenticate_user, :only => [:new, :create, :update, :destroy]
+    before_action :authenticate_artist, :only => [:new, :create, :update, :destroy]
   end
   
   def index
@@ -73,9 +73,9 @@ class ResourcePicturesController < ApplicationController
       jsn = JSON.parse_no_except(params[:json])
     end
     @prm = if params[:resource_picture] == nil or params[:resource_picture].empty?
-       jsn
+      jsn
     else
-       params[:resource_picture]
+      @item.permit_params(:resource_picture)
     end
     @item = @original_picture.resource_picture || ResourcePicture.new
     @item.attributes = @prm