Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

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

diff --git a/app/models/balloon.rb b/app/models/balloon.rb
index c80e92f..73f538c 100644 (file)
--- a/app/models/balloon.rb
+++ b/app/models/balloon.rb
@@ -16,7 +16,7 @@ class Balloon < Peta::Element
 #  validates :caption, :presence => true
   validates :speech_balloon_template_settings, :boost => {:boost_name => :speech_balloon_template}
 
-  def _y
+  def y
     self.attributes['y']
   end
   
@@ -37,7 +37,7 @@ self.system_picture_id = 1
     self.speech_balloon.speech_balloon_template.symbol_option
   end
   
-  def self.public_list_where
+  def self.public_list_where list
     'panels.publish > 0'
   end
   
@@ -58,7 +58,7 @@ self.system_picture_id = 1
   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