X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fspeech_balloon_templates_controller.rb;h=0b2d024951f1c752162ba56f41cc2f625f5ff652;hb=665761e56525215946e2547a70c82c603d5047af;hp=132aae7ee22f2007bb94865e4c9a445afa89d916;hpb=b0a5d3f3d8c21fcdaabd1be05f0cfb73a7395f09;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/speech_balloon_templates_controller.rb b/app/controllers/speech_balloon_templates_controller.rb
index 132aae7e..0b2d0249 100644
--- a/app/controllers/speech_balloon_templates_controller.rb
+++ b/app/controllers/speech_balloon_templates_controller.rb
@@ -8,10 +8,6 @@ class SpeechBalloonTemplatesController < ApplicationController
     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
@@ -27,7 +23,6 @@ class SpeechBalloonTemplatesController < ApplicationController
   
   def show_html_format format
     format.html {
-      @speech_balloon_template = @item
     }
   end
   
@@ -61,8 +56,8 @@ class SpeechBalloonTemplatesController < ApplicationController
   end
   
   def destroy
-    @speech_balloon_template = SpeechBalloonTemplate.find(params[:id])
-    @speech_balloon_template.destroy
+    @item = SpeechBalloonTemplate.find(params[:id])
+    @item.destroy
 
     respond_to do |format|
       format.html { redirect_to :action => :list }