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

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

diff --git a/app/controllers/speeches_controller.rb b/app/controllers/speeches_controller.rb
index 006275e..1095fdb 100644 (file)
--- a/app/controllers/speeches_controller.rb
+++ b/app/controllers/speeches_controller.rb
@@ -1,11 +1,12 @@
 class SpeechesController < 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
   before_filter :authenticate_admin!, :only => [:list, :browse]
 
@@ -21,7 +22,7 @@ class SpeechesController < ApplicationController
   end
   
   def show
-    @speech = Speech.show(params[:id], @author)
+    @speech = Speech.show(params[:id], [@user, @admin])
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @speech.to_json(Speech.show_json_opt) }