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

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

diff --git a/app/controllers/speech_balloons_controller.rb b/app/controllers/speech_balloons_controller.rb
index 5d2d711..3b8e400 100644 (file)
--- a/app/controllers/speech_balloons_controller.rb
+++ b/app/controllers/speech_balloons_controller.rb
@@ -1,48 +1,45 @@
 class SpeechBalloonsController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  if MagicNumber['run_mode'] == 0
+  if Manifest.manifest.magic_numbers['run_mode'] == 0
     before_filter :authenticate_user, :only => []
+    before_filter :authenticate_author, :only => []
   else
-    before_filter :authenticate_reader, :only => [:index, :show]
+    before_filter :authenticate_reader, :only => [
+      :index, :show, :by_panel, :by_author, :by_speech_balloon_template
+    ]
     before_filter :authenticate_user, :only => []
+    before_filter :authenticate_author, :only => []
   end
-  before_filter :authenticate_admin!, :only => [:list, :browse]
-
+  
   def index
-    @page = SpeechBalloon.page params[:page]
-    @page_size = SpeechBalloon.page_size params[:page_size]
-    @speech_balloons = SpeechBalloon.list(@page, @page_size)
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render json: @speech_balloons.to_json(SpeechBalloon.list_json_opt) }
-    end
+    filer_list
   end
   
-  def show
-    @speech_balloon = SpeechBalloon.show(params[:id], [@author, @admin])
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @speech_balloon.to_json(SpeechBalloon.show_json_opt) }
-    end
+  def by_panel
+    filer_list
   end
   
-  def list
-    @speech_balloons = SpeechBalloon.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @speech_balloons }
-    end
+  def by_author
+    filer_list
   end
-
-  def browse
-    @speech_balloon = SpeechBalloon.find(params[:id])
-
+  
+  def by_speech_balloon_template
+    filer_list
+  end
+  
+  def show_html_format format
+    format.html {
+      @item.boosts 'post'
+      @speech_balloon = @item
+    }
+  end
+  
+  def show
+    set_show
     respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @speech_balloon }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
-
+  
 end