X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Fspeech_balloon.rb;h=d5a4148841644467a6e9a531258372bf650dd04b;hb=31124ac1df4b11438308bb83525753b3e40e355a;hp=875041ac7d77d098e2b41e69946fb20a07445d4f;hpb=1b3722cca7c8de628bc1de97b4b95ab42a626454;p=pettanr%2Fpettanr.git

diff --git a/app/models/speech_balloon.rb b/app/models/speech_balloon.rb
index 875041ac..d5a41488 100644
--- a/app/models/speech_balloon.rb
+++ b/app/models/speech_balloon.rb
@@ -10,10 +10,10 @@ class SpeechBalloon < Peta::Element
   
   validates :panel_id, :numericality => {:allow_blank => true}
   validates :speech_balloon_template_id, :presence => true, :numericality => true, :existence => {:both => false}
-  validates :classname, :presence => true, :length => {:maximum => 50}
+  validates :speech_balloon_template_classname, :presence => true, :length => {:maximum => 50}
   validates :z, :presence => true, :numericality => {:greater_than => 0}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
-  validates :settings, :extend_speech_balloon => true
+  validates :speech_balloon_template_settings, :boost => {:resource_name => :speech_balloon_template}
   
   def self.by_author_list_includes
     {
@@ -56,11 +56,6 @@ class SpeechBalloon < Peta::Element
     self.panel_id = pid
   end
   
-  def visible? operators
-    return false unless super
-    self.owner_model.visible? operators
-  end
-  
   def symbol_option
     self.speech_balloon_template.symbol_option
   end
@@ -69,7 +64,7 @@ class SpeechBalloon < Peta::Element
     'speech_balloon'
   end
   
-  def self.list_where
+  def self.public_list_where
     'panels.publish > 0'
   end