t#31725:add panel inspire

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

diff --git a/app/models/balloon.rb b/app/models/balloon.rb
index 7ca441c..90f0518 100644 (file)
--- a/app/models/balloon.rb
+++ b/app/models/balloon.rb
@@ -72,7 +72,7 @@ self.system_picture_id = 1
     r = if self.get_speech_balloon == nil or self.get_speech_balloon.new_record?
       0
     else
-      self.get_speech_balloon.panel.id
+      self.get_speech_balloon.id
     end
     r.to_s
   end
@@ -146,6 +146,19 @@ self.system_picture_id = 1
     {:include => {:speech_balloon => {:include => {:panel => {:include => {:author => {} }}, :speech => {}, :speech_balloon_template => {} }}}}
   end
   
+  def copy_attributes
+    r = self.attributes
+    r.delete 'id'
+    r.delete 'speech_balloon_id'
+    r.delete 'created_at'
+    r.delete 'updated_at'
+    r
+  end
+  
+  def self.panelize balloon_attributes
+    {'balloon_attributes' => balloon_attributes}
+  end
+  
   def scenario
   end