X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fpanel_colors_controller.rb;h=eaaf34df3953f4d6148b041030960025ef9ae5ce;hb=2aa10ee1ef8c348a958cb53b44c51b2cebfaadb7;hp=84f5623da397f9632810e5162fa3e5d046121849;hpb=92e42b345715a552a4ce833b03ec68aed94792e0;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/panel_colors_controller.rb b/app/controllers/panel_colors_controller.rb
index 84f5623d..eaaf34df 100644
--- a/app/controllers/panel_colors_controller.rb
+++ b/app/controllers/panel_colors_controller.rb
@@ -1,11 +1,12 @@
 class PanelColorsController < 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_reader, :only => [:index, :show]
+    before_filter :authenticate_user, :only => []
+    before_filter :authenticate_author, :only => []
   end
 
   # GET /ground_pictures
@@ -22,7 +23,7 @@ class PanelColorsController < ApplicationController
   end
   
   def show
-    @panel_color = PanelColor.show(params[:id], @author)
+    @panel_color = PanelColor.show(params[:id], [@user, @admin])
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @panel_color.to_json(PanelColor.show_json_opt) }