t#:

[pettanr/pettanr.git] / app / models / speech_balloon_template.rb

diff --git a/app/models/speech_balloon_template.rb b/app/models/speech_balloon_template.rb
index b2f3d99..dd20d25 100644 (file)
--- a/app/models/speech_balloon_template.rb
+++ b/app/models/speech_balloon_template.rb
@@ -25,16 +25,9 @@ class SpeechBalloonTemplate < Pettanr::Item
     self.system_picture.tmb_opt_img_tag
   end
   
-  def self.list
-    opt = {}
-    opt.merge!(self.list_opt)
-    opt.merge!({:order => 'speech_balloon_templates.t asc'})
-    SpeechBalloonTemplate.find(:all, opt)
-  end
-  
   def self.enable_list
-    SpeechBalloonTemplate.list.delete_if {|sbt|
-      Pettanr::Application.manifest.system_resources.speech_balloon_templates[sbt.classname] == nil
+    SpeechBalloonTemplate.find(:all).delete_if {|sbt|
+      sbt.enable? == false
     }
   end
   
@@ -72,6 +65,10 @@ class SpeechBalloonTemplate < Pettanr::Item
     Pettanr::Application.manifest.system_resources.speech_balloon_templates[self.classname]
   end
   
+  def enable?
+    Pettanr::Application.manifest.system_resources.speech_balloon_templates.include? self.classname
+  end
+  
   def engine_module_name
     self.engine_name.camelize
   end