fix extend

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

diff --git a/app/models/speech.rb b/app/models/speech.rb
index cf81249..acd0a83 100644 (file)
--- a/app/models/speech.rb
+++ b/app/models/speech.rb
@@ -1,10 +1,14 @@
 class Speech < Peta::Element
   load_manifest
   belongs_to :speech_balloon
+  belongs_to :speech_balloon_template
   belongs_to :writing_format
   
   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 :writing_format_id, :presence => true, :numericality => true, :existence => {:both => false}
+  validates :writing_format_classname, :presence => true, :length => {:maximum => 50}
   validates :font_size, :presence => true, :numericality => {:only_integer => false}
   validates :text_align, :presence => true, :numericality => true, :inclusion => { :in => 0..3 }
   validates :fore_color, :presence => true, :numericality => {:greater_than_or_equal_to => 0, :less_than => 0x1000000}
@@ -13,7 +17,8 @@ class Speech < Peta::Element
   validates :width, :presence => true, :numericality => true, :natural_number => true
   validates :height, :presence => true, :numericality => true, :natural_number => true
   validates :quotes, :length => {:maximum => 15}, :quotes_even => true
-  validates :settings, :extend_speech => true
+  validates :speech_balloon_template_settings, :extend_speech => true
+  #validates :writing_format_settings
   
   @@text_align_texts = ['left', 'left', 'right', 'center']
   
@@ -24,11 +29,6 @@ class Speech < Peta::Element
     self.height = 100
   end
   
-  def visible? operators
-    return false unless super
-    self.owner_model.visible? operators
-  end
-  
   def symbol_option
     self.speech_balloon.speech_balloon_template.symbol_option
   end