t#30558:fix auth filter

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

diff --git a/app/controllers/ground_pictures_controller.rb b/app/controllers/ground_pictures_controller.rb
index 8836779..f940c58 100644 (file)
--- a/app/controllers/ground_pictures_controller.rb
+++ b/app/controllers/ground_pictures_controller.rb
@@ -2,9 +2,11 @@ class GroundPicturesController < ApplicationController
   layout 'test' if MagicNumber['test_layout']
   if MagicNumber['run_mode'] == 0
     before_filter :authenticate_user, :only => []
+    before_filter :authenticate_author, :only => []
   else
     before_filter :authenticate_reader, :only => [:index, :show]
     before_filter :authenticate_user, :only => []
+    before_filter :authenticate_author, :only => []
   end
 
   # GET /ground_pictures
@@ -21,7 +23,7 @@ class GroundPicturesController < ApplicationController
   end
 
   def show
-    @ground_picture = GroundPicture.show(params[:id], [@author, @admin])
+    @ground_picture = GroundPicture.show(params[:id], [@user, @admin])
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @ground_picture.to_json(GroundPicture.show_json_opt) }