t#31656:destroy element

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

diff --git a/app/models/speech.rb b/app/models/speech.rb
index e51ef90..3ec0c27 100644 (file)
--- a/app/models/speech.rb
+++ b/app/models/speech.rb
@@ -6,12 +6,13 @@ class Speech < ActiveRecord::Base
   validates :y, :presence => true, :numericality => true
   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, :presence => true
   
   before_validation :valid_encode
   
   def valid_encode
-    ['content', 'settings'].each do |a|
+    ['content', 'quotes', 'settings'].each do |a|
       next if attributes[a] == nil
       raise Pettanr::BadRequest unless attributes[a].valid_encoding?
     end
@@ -34,6 +35,18 @@ class Speech < ActiveRecord::Base
     self.speech_balloon.panel.visible? roles
   end
   
+  def get_speech_balloon
+    self.speech_balloon
+  end
+  
+  def get_panel_id
+    if self.get_speech_balloon == nil or self.get_speech_balloon.panel == nil or self.get_speech_balloon.panel.new_record?
+      0
+    else
+      self.get_speech_balloon.panel.id
+    end
+  end
+  
   def tag_id c = nil
     'panel' + tag_panel_id + tag_element_type + tag_element_id + tag_element_part_type + tag_element_part_id + c.to_s
   end
@@ -43,11 +56,16 @@ class Speech < ActiveRecord::Base
   end
   
   def tag_panel_id
-    self.speech_balloon.panel.new_record? ? '0' : self.speech_balloon.panel.id.to_s
+    self.get_panel_id.to_s
   end
   
   def tag_element_id
-    self.speech_balloon.new_record? ? '0' : self.speech_balloon.id.to_s
+    r = if self.get_speech_balloon == nil or self.get_speech_balloon.new_record?
+      0
+    else
+      self.get_speech_balloon.id
+    end
+    r.to_s
   end
   
   def tag_element_type
@@ -127,4 +145,8 @@ class Speech < ActiveRecord::Base
     self.content + "\n"
   end
   
+  def feed
+    ERB::Util.html_escape(self.content)
+  end
+  
 end