fix extend

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

diff --git a/app/models/balloon.rb b/app/models/balloon.rb
index ebca4ef..74c4122 100644 (file)
--- a/app/models/balloon.rb
+++ b/app/models/balloon.rb
@@ -1,9 +1,12 @@
 class Balloon < Peta::Element
   load_manifest
   belongs_to :speech_balloon
+  belongs_to :speech_balloon_template
   belongs_to :system_picture
   
   validates :speech_balloon_id, :numericality => {:allow_blank => true}
+  validates :speech_balloon_template_id, :presence => true, :numericality => true, :existence => {:both => false}
+  validates :speech_balloon_template_classname, :presence => true, :length => {:maximum => 50}
   validates :system_picture_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :x, :presence => true, :numericality => true
   validates :y, :presence => true, :numericality => true
@@ -11,17 +14,12 @@ class Balloon < Peta::Element
   validates :height, :presence => true, :numericality => true, :natural_number => true
   validates :r, :presence => true, :numericality => true
 #  validates :caption, :presence => true
-  validates :settings, :extend_balloon => true
+  validates :speech_balloon_template_settings, :extend_balloon => true
 
   def url
     '/system_pictures/' + self.system_picture.filename
   end
   
-  def visible? operators
-    return false unless super
-    self.owner_model.visible? operators
-  end
-  
   def supply_default
     self.x = 0
     self.y = 0