Merge branch 'v05' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v05client

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

diff --git a/app/controllers/system_pictures_controller.rb b/app/controllers/system_pictures_controller.rb
index ca16cf7..ae6a671 100644 (file)
--- a/app/controllers/system_pictures_controller.rb
+++ b/app/controllers/system_pictures_controller.rb
@@ -1,11 +1,12 @@
 class SystemPicturesController < ApplicationController
   layout 'test' if MagicNumber['test_layout']
   if MagicNumber['run_mode'] == 0
-    before_filter :authenticate_user!, :only => []
+    before_filter :authenticate_user, :only => []
     before_filter :authenticate_author, :only => []
   else
-    before_filter :authenticate_user!, :only => [:index, :show]
-    before_filter :authenticate_author, :only => [:index, :show]
+    before_filter :authenticate_resource_reader, :only => [:index, :show]
+    before_filter :authenticate_user, :only => []
+    before_filter :authenticate_author, :only => []
   end
   before_filter :authenticate_admin!, :only => [:list, :browse, :new, :create]
 
@@ -25,7 +26,7 @@ class SystemPicturesController < ApplicationController
   # GET /system_pictures/1
   # GET /system_pictures/1.json
   def show
-    @system_picture = SystemPicture.show(params[:id], @author)
+    @system_picture = SystemPicture.show(params[:id], [@user, @admin, @demand_user])
     
     respond_to do |format|
       opt = {:type => @system_picture.mime_type, :disposition=>"inline"}