fix: views

[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 aeeb9ce..191172f 100644 (file)
--- a/app/controllers/speech_balloons_controller.rb
+++ b/app/controllers/speech_balloons_controller.rb
@@ -1,17 +1,13 @@
 class SpeechBalloonsController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
+    before_action :authenticate_user, :only => []
+    before_action :authenticate_author, :only => []
   else
-    before_filter :authenticate_reader, :only => [
-      :index, :show, :by_panel, :by_author, :by_speech_balloon_template, :count, :count_by_panel, :count_by_author, :count_by_speech_balloon_template
+    before_action :authenticate_reader, :only => [
+      :index, :show, :by_panel, :by_author, :by_speech_balloon_template
     ]
-    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_action :authenticate_user, :only => []
+    before_action :authenticate_author, :only => []
   end
   
   def index
@@ -19,15 +15,15 @@ class SpeechBalloonsController < ApplicationController
   end
   
   def by_panel
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_author
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_speech_balloon_template
-    filer_list
+    filer_list param: params[:id]
   end
   
   def show_html_format format
@@ -46,103 +42,4 @@ class SpeechBalloonsController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
-  def count_by_speech_balloon_template
-    list_count
-  end
-  
-  def new
-    form_new
-  end
-  
-  def edit
-    form_edit
-  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
-    @item = SpeechBalloon.show(params[:id], @operators)
-    @speech_balloon = @item
-    @form = Locmare::Bucket.factory @item.item_name, @item, true, true, @operators
-    @form.fold_extend_settings params
-    @speech_balloon.attributes = params[:speech_balloon]
-    
-    @speech_balloon_template = @speech_balloon.speech_balloon_template
-    
-    params[:speech_balloon][:balloon_attributes][:system_picture_id] = @speech_balloon.balloon.select_system_picture 
-    
-    @panel = Panel.edit(@speech_balloon.panel.id, @operators)
-    @speech_balloon.overwrite @panel.id
-    
-    respond_to do |format|
-      if @speech_balloon.save
-        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)
-    
-    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
-    end
-  end
-  
 end