upgrade rails 3.2

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

diff --git a/app/models/balloon.rb b/app/models/balloon.rb
index f3f9460..bce4d6a 100644 (file)
--- a/app/models/balloon.rb
+++ b/app/models/balloon.rb
@@ -14,8 +14,12 @@ class Balloon < Peta::Element
   validates :height, :presence => true, :numericality => true, :natural_number => true
   validates :r, :presence => true, :numericality => true
 #  validates :caption, :presence => true
-  validates :speech_balloon_template_settings, :boost => {:resource_name => :speech_balloon_template}
+  validates :speech_balloon_template_settings, :boost => {:boost_name => :speech_balloon_template}
 
+  def _y
+    self.attributes['y']
+  end
+  
   def url
     '/system_pictures/' + self.system_picture.filename
   end
@@ -37,10 +41,6 @@ self.system_picture_id = 1
     'panels.publish > 0'
   end
   
-  def self.list_order
-    'balloons.updated_at desc'
-  end
-  
   def self.by_author_list_includes
     {
       :speech_balloon => {
@@ -51,26 +51,14 @@ self.system_picture_id = 1
     }
   end
   
-  def self.list_opt
-    {:speech_balloon => {:panel => {:author => {}}, :speech => {}, :speech_balloon_template => {} }}
-  end
-  
-  def self.list_json_opt
-    {:include => {:speech_balloon => {:include => {:panel => {:include => {:author => {} }}, :speech => {}, :speech_balloon_template => {} }}}}
-  end
-  
   def self.show_opt
     {:include => {:speech_balloon => {:panel => {:author => {}}, :speech => {}, :speech_balloon_template => {} }}}
   end
   
-  def self.show_json_opt
-    {:include => {:speech_balloon => {:include => {:panel => {:include => {:author => {} }}, :speech => {}, :speech_balloon_template => {} }}}}
-  end
-  
   def style
     {
       'width' => self.width.to_s + 'px','height' => self.height.to_s + 'px',
-      'top' => self.y.to_s + 'px','left' => self.x.to_s + 'px'
+      'top' => self._y.to_s + 'px','left' => self.x.to_s + 'px'
     }
   end