t#30473:fix authenticate

[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 a13eca3..ab9e01d 100644 (file)
--- a/app/controllers/resource_pictures_controller.rb
+++ b/app/controllers/resource_pictures_controller.rb
@@ -1,12 +1,11 @@
 class ResourcePicturesController < ApplicationController
   layout 'test' if MagicNumber['test_layout']
   if MagicNumber['run_mode'] == 0
-    before_filter :authenticate_user!, :only => [:new, :create, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :create, :update, :destroy]
+    before_filter :authenticate_resource_user, :only => [:new, :create, :update, :destroy]
     before_filter :authenticate_artist, :only => [:new, :create, :destroy]
   else
-    before_filter :authenticate_user!, :only => [:index, :show, :credit, :new, :create, :update, :destroy]
-    before_filter :authenticate_author, :only => [:index, :show, :credit, :new, :create, :update, :destroy]
+    before_filter :authenticate_resource_reader, :only => [:index, :show, :credit]
+    before_filter :authenticate_user, :only => [:new, :create, :update, :destroy]
     before_filter :authenticate_artist, :only => [:new, :create, :destroy]
   end
   before_filter :authenticate_admin!, :only => [:list, :browse]