t#30137:fix authenticate

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

diff --git a/app/controllers/original_pictures_controller.rb b/app/controllers/original_pictures_controller.rb
index e8e451c..fb6a7a3 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -22,7 +22,7 @@ class OriginalPicturesController < ApplicationController
   # GET /original_pictures/1
   # GET /original_pictures/1.json
   def show
-    @original_picture = OriginalPicture.show(params[:id], @admin || @artist)
+    @original_picture = OriginalPicture.show(params[:id], [@artist, @admin])
     
     respond_to do |format|
       opt = {:type => @original_picture.mime_type, :disposition=>"inline"}
@@ -39,7 +39,7 @@ class OriginalPicturesController < ApplicationController
   end
 
   def history
-    @original_picture = OriginalPicture.show(params[:id], @artist)
+    @original_picture = OriginalPicture.show(params[:id], [@artist, @admin])
     @history = @original_picture.history
     
     respond_to do |format|