fix anything

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

diff --git a/app/models/speech.rb b/app/models/speech.rb
index 506671c..076c80d 100644 (file)
--- a/app/models/speech.rb
+++ b/app/models/speech.rb
@@ -1,11 +1,14 @@
-class Speech < Peta::Content
+class Speech < Peta::Element
   load_manifest
-  include Peta::ElementPart
   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}
@@ -14,18 +17,11 @@ class Speech < Peta::Content
   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, :boost => {:resource_name => :speech_balloon_template}
+  #validates :writing_format_settings
   
   @@text_align_texts = ['left', 'left', 'right', 'center']
   
-  def self.colum_structures
-    @@colum_structures ||= {
-      :fore_color => {
-        :helper => 'panels/color_helper'
-      }
-    }
-  end
-  
   def supply_default
     self.x = 0
     self.y = 0
@@ -33,21 +29,8 @@ class Speech < Peta::Content
     self.height = 100
   end
   
-  def visible? operators
-    return false unless super
-    self.owner_model.visible? operators
-  end
-  
   def symbol_option
-    self.get_parent.speech_balloon_template.symbol_option
-  end
-  
-  def get_parent
-    self.speech_balloon || @new_parent
-  end
-  
-  def tag_element_part_type
-    'speech'
+    self.speech_balloon.speech_balloon_template.symbol_option
   end
   
   def outer_style
@@ -69,7 +52,7 @@ class Speech < Peta::Content
     @@text_align_texts[self.text_align]
   end
   
-  def self.list_where
+  def self.public_list_where
     'panels.publish > 0'
   end
   
@@ -77,6 +60,16 @@ class Speech < Peta::Content
     'speeches.updated_at desc'
   end
   
+  def self.by_author_list_includes
+    {
+      :speech_balloon => {
+        :panel => {
+          :author => {}
+        }
+      }
+    }
+  end
+  
   def self.list_opt
     {:speech_balloon => {:panel => {:author => {}}, :balloon => {}, :speech_balloon_template => {}} }
   end