X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fspeech_balloons_controller.rb;h=3b8e40025e2e8d8b920e4ef791bfa828007c4221;hb=091b085aa054691dfe37d6f55f699dcb80f63ee5;hp=4aede9dbd75da6c5752b17c3e410af8b336df51f;hpb=6e4ecd2a9d6e7b3c37a9f5a1609683eef7d95eee;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/speech_balloons_controller.rb b/app/controllers/speech_balloons_controller.rb
index 4aede9db..3b8e4002 100644
--- a/app/controllers/speech_balloons_controller.rb
+++ b/app/controllers/speech_balloons_controller.rb
@@ -1,145 +1,44 @@
 class SpeechBalloonsController < 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_author, :only => [:new, :edit, :create, :update, :destroy]
+  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, :by_panel, :by_author]
-    before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
-  end
-
-  def self.model
-    SpeechBalloon
+    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
   
   def index
-    public_list
+    filer_list
   end
   
   def by_panel
-    filter_list
+    filer_list
   end
   
   def by_author
-    filter_list
+    filer_list
   end
   
-  def show
-    @item = SpeechBalloon.show(params[:id], @operators)
-    respond_to do |format|
-      format.html {
-        @speech_balloon = @item
-      }
-      format_prof format
-      format.json { render json: @item.to_json(SpeechBalloon.show_json_opt) }
-    end
+  def by_speech_balloon_template
+    filer_list
   end
   
-  def new
-    raise Pettanr::NotWork unless @operators.author.working_panel
-    @speech_balloon_template = SpeechBalloonTemplate.show params[:speech_balloon_template_id], @operators
-    
-    @panel = Panel.edit(@operators.author.working_panel, @operators)
-    @speech_balloon = SpeechBalloon.new :panel_id => @panel.id, :speech_balloon_template_id => @speech_balloon_template.id
-    @speech_balloon.boost
-    @speech_balloon.supply_default
-    @speech_balloon.get_balloon.supply_default 
-    @speech_balloon.get_speech.supply_default 
-    
-    respond_to do |format|
-      format.html {
-        render @speech_balloon_template.engine_name + '/speech_balloons/new'
-      }
-      format.json { render :json => @speech_balloon.to_json(SpeechBalloon.show_json_opt) }
-    end
-  end
-
-  def edit
-    @speech_balloon = SpeechBalloon.show(params[:id], @operators)
-    @speech_balloon_template = @speech_balloon.speech_balloon_template
-    @panel = Panel.edit(@speech_balloon.panel.id,@operators)
-    
-    @speech_balloon.boost
-    
-    respond_to do |format|
-      format.html {
-        render @speech_balloon_template.engine_name + '/speech_balloons/edit'
-      }
-    end
+  def show_html_format format
+    format.html {
+      @item.boosts 'post'
+      @speech_balloon = @item
+    }
   end
-
-  def create
-    raise Pettanr::NotWork unless @operators.author.working_panel
-    SpeechBalloon.fold_extend_settings params
-    @panel = Panel.edit(@operators.author.working_panel, @operators)
-    @speech_balloon = SpeechBalloon.new 
-    @speech_balloon.attributes = params[:speech_balloon]
-    
-    @speech_balloon_template = @speech_balloon.speech_balloon_template
-    @speech_balloon.boost
-    
-    params[:speech_balloon][:balloon_attributes][:system_picture_id] = @speech_balloon.get_balloon.select_system_picture 
-    
-    @speech_balloon.overwrite @panel.id
-    
-    respond_to do |format|
-      if @speech_balloon.valid? and @speech_balloon.store(@operators, params[:speech_balloon])
-        flash[:notice] = I18n.t('flash.notice.created', :model => Panel.model_name.human)
-        format.html { redirect_to @panel }
-        format.json { render json: @panel.panel_elements_as_json, status: :created, location: @panel }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_created', :model => SpeechBalloon.model_name.human)
-        format.html {
-          render @speech_balloon_template.engine_name + '/speech_balloons/new'
-        }
-        format.json { render json: @speech_balloon.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  def update
-    SpeechBalloon.fold_extend_settings params
-    @speech_balloon = SpeechBalloon.show(params[:id], @operators)
-    @speech_balloon.attributes = params[:speech_balloon]
-    
-    @speech_balloon_template = @speech_balloon.speech_balloon_template
-    @speech_balloon.boost
-    
-    params[:speech_balloon][:balloon_attributes][:system_picture_id] = @speech_balloon.get_balloon.select_system_picture 
-    
-    @panel = Panel.edit(@speech_balloon.panel.id, @operators)
-    @speech_balloon.overwrite @panel.id
-    
-    respond_to do |format|
-      if @speech_balloon.valid? and @speech_balloon.store(@operators, params[:speech_balloon])
-        flash[:notice] = I18n.t('flash.notice.updated', :model => SpeechBalloon.model_name.human)
-        format.html { redirect_to @speech_balloon }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_updated', :model => SpeechBalloon.model_name.human)
-        format.html {
-          render @speech_balloon.speech_balloon_template.engine_name + '/speech_balloons/edit'
-        }
-        format.json { render json: @speech_balloon.errors, status: :unprocessable_entity }
-      end
-    end
-  end
-
-  def destroy
-    @speech_balloon = SpeechBalloon.show(params[:id], @operators)
-    @panel = Panel.edit(@speech_balloon.panel.id, @operators)
-    
+  
+  def show
+    set_show
     respond_to do |format|
-      if @speech_balloon.remove @operators.author
-        flash[:notice] = I18n.t('flash.notice.destroyed', :model => SpeechBalloon.model_name.human)
-        format.html { redirect_to @panel }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => SpeechBalloon.model_name.human)
-        format.html { redirect_to @speech_balloon }
-        format.json { render json: @speech_balloon.errors, status: :unprocessable_entity }
-      end
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end