X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Fspeech.rb;h=2b21720381c83a5647fb69c02bc20ea3da815245;hb=eaa552749ac347007bf8cf34e352282397c02779;hp=076c80de38da96ea086b0118d0bff806913999bf;hpb=31124ac1df4b11438308bb83525753b3e40e355a;p=pettanr%2Fpettanr.git

diff --git a/app/models/speech.rb b/app/models/speech.rb
index 076c80de..2b217203 100644
--- a/app/models/speech.rb
+++ b/app/models/speech.rb
@@ -17,7 +17,7 @@ class Speech < Peta::Element
   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 :speech_balloon_template_settings, :boost => {:resource_name => :speech_balloon_template}
+  validates :speech_balloon_template_settings, :boost => {:boost_name => :speech_balloon_template}
   #validates :writing_format_settings
   
   @@text_align_texts = ['left', 'left', 'right', 'center']
@@ -35,7 +35,7 @@ class Speech < Peta::Element
   
   def outer_style
     {
-      'top' => self.y, 'left' => self.x, 
+      'top' => self._y, 'left' => self.x, 
       'width' => self.width, 'height' => self.height
     }
   end
@@ -56,10 +56,6 @@ class Speech < Peta::Element
     'panels.publish > 0'
   end
   
-  def self.list_order
-    'speeches.updated_at desc'
-  end
-  
   def self.by_author_list_includes
     {
       :speech_balloon => {
@@ -70,22 +66,10 @@ class Speech < Peta::Element
     }
   end
   
-  def self.list_opt
-    {:speech_balloon => {:panel => {:author => {}}, :balloon => {}, :speech_balloon_template => {}} }
-  end
-  
-  def self.list_json_opt
-    {:include => {:speech_balloon => {:include => {:panel => {:include => {:author => {} }}, :balloon => {}, :speech_balloon_template => {} }}}}
-  end
-  
   def self.show_opt
     {:include => {:speech_balloon => {:panel => {:author => {}}, :balloon => {}, :speech_balloon_template => {} }}}
   end
   
-  def self.show_json_opt
-    {:include => {:speech_balloon => {:include => {:panel => {:include => {:author => {} }}, :balloon => {}, :speech_balloon_template => {} }}}}
-  end
-  
   def copy_attributes
     r = self.attributes
     r.delete 'id'