t#31521:fix story pager

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

diff --git a/app/models/balloon.rb b/app/models/balloon.rb
index 90f0518..2ace3dc 100644 (file)
--- a/app/models/balloon.rb
+++ b/app/models/balloon.rb
@@ -10,7 +10,7 @@ class Balloon < ActiveRecord::Base
   validates :height, :presence => true, :numericality => true, :natural_number => true
   validates :r, :presence => true, :numericality => true
 #  validates :caption, :presence => true
-#  validates :settings, :presence => true
+  validates :settings, :extend_balloon => true
 
   before_validation :valid_encode
   
@@ -44,8 +44,16 @@ class Balloon < ActiveRecord::Base
 self.system_picture_id = 1
   end
   
+  def new_speech_balloon
+    @new_speech_balloon
+  end
+  
+  def new_speech_balloon= v
+    @new_speech_balloon = v
+  end
+  
   def get_speech_balloon
-    self.speech_balloon
+    self.speech_balloon || @new_speech_balloon
   end
   
   def get_panel_id
@@ -89,8 +97,12 @@ self.system_picture_id = 1
     'balloon'
   end
   
-  def field_tree f
-    'panels-' + self.tag_panel_id + '-speech_balloons_attributes-' + self.tag_element_id + '-balloon_attributes-' + f.to_s
+  def tag_new_index
+    if self.get_speech_balloon == nil
+      nil
+    else
+      self.get_speech_balloon.tag_new_index
+    end
   end
   
   def self.default_page_size