fix: server

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

diff --git a/app/controllers/speech_balloon_templates_controller.rb b/app/controllers/speech_balloon_templates_controller.rb
index 96f337d..2499e6e 100644 (file)
--- a/app/controllers/speech_balloon_templates_controller.rb
+++ b/app/controllers/speech_balloon_templates_controller.rb
@@ -3,15 +3,11 @@ class SpeechBalloonTemplatesController < ApplicationController
     before_filter :authenticate_user, :only => []
   else
     before_filter :authenticate_reader, :only => [
-      :index, :show, :by_panel, :by_system_picture, :count, :count_by_panel, :count_by_system_picture
+      :index, :show, :by_panel, :by_system_picture
     ]
     before_filter :authenticate_user, :only => []
   end
   before_filter :authenticate_admin, :only => [:new, :create, :edit, :update, :destroy]
-
-  def self.model
-    SpeechBalloonTemplate
-  end
   
   def index
     filer_list
@@ -39,18 +35,6 @@ class SpeechBalloonTemplatesController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
-  def count_by_system_picture
-    list_count
-  end
-  
   def new
     form_new
   end
@@ -60,12 +44,9 @@ class SpeechBalloonTemplatesController < ApplicationController
   end
   
   def destroy
-    @item = SpeechBalloonTemplate.find(params[:id])
-    @item.destroy
-
-    respond_to do |format|
-      format.html { redirect_to :action => :list }
-      format.json { head :ok }
-    end
+    set_model
+    @item = @my_model_class.edit(params[:id], @operators)
+    render_destroy '/' + @my_model_class.path_name
   end
+  
 end