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

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

diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index ebbb8ba..3757298 100644 (file)
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -1,11 +1,12 @@
 class PanelsController < ApplicationController
   layout 'test' if MagicNumber['test_layout']
   if MagicNumber['run_mode'] == 0
-    before_filter :authenticate_user!, :only => [:new, :edit, :create, :update, :destroy]
+    before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
     before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
   else
-    before_filter :authenticate_user!, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
-    before_filter :authenticate_author, :only => [:index, :show, :new, :edit, :create, :update, :destroy]
+    before_filter :authenticate_reader, :only => [:index, :show]
+    before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+    before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
   end
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
@@ -23,7 +24,7 @@ class PanelsController < ApplicationController
   end
 
   def show
-    @panel = Panel.show(params[:id], @author)
+    @panel = Panel.show(params[:id], [@user, @admin])
 
     respond_to do |format|
       format.html # show.html.erb