fix foreign_filter list includes

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

diff --git a/app/models/speech_balloon.rb b/app/models/speech_balloon.rb
index dde1ed1..a7f08e4 100644 (file)
--- a/app/models/speech_balloon.rb
+++ b/app/models/speech_balloon.rb
@@ -1,6 +1,5 @@
-class SpeechBalloon < Peta::Content
-  include Peta::Element
-  include ElementInspire
+class SpeechBalloon < Peta::Element
+  load_manifest
   has_one :balloon, :dependent => :destroy
   has_one :speech, :dependent => :destroy
   belongs_to :speech_balloon_template
@@ -16,12 +15,12 @@ class SpeechBalloon < Peta::Content
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   validates :settings, :extend_speech_balloon => true
   
-  def self.owner_model
-    Panel
-  end
-  
-  def self.valid_encode_columns
-    super + ['caption', 'classname', 'settings']
+  def self.by_author_list_includes
+    {
+      :panel => {
+        :author => {}
+      }
+    }
   end
   
   def self.list_opt_for_panel
@@ -46,10 +45,6 @@ class SpeechBalloon < Peta::Content
     false
   end
   
-  def extend_column
-    'classname'
-  end
-  
   def supply_default
     if self.panel
       self.t = self.panel.new_t 
@@ -70,30 +65,6 @@ class SpeechBalloon < Peta::Content
     self.speech_balloon_template.symbol_option
   end
   
-  def new_balloon
-    @new_balloon
-  end
-  
-  def new_balloon= v
-    @new_balloon = v
-  end
-  
-  def get_balloon
-    self.balloon || @new_balloon
-  end
-  
-  def new_speech
-    @new_speech
-  end
-  
-  def new_speech= v
-    @new_speech = v
-  end
-  
-  def get_speech
-    self.speech || @new_speech
-  end
-  
   def boost
     self.extend self.speech_balloon_template.engine_speech_balloon_module
     if self.balloon
@@ -103,6 +74,7 @@ class SpeechBalloon < Peta::Content
     end
     self.balloon.extend self.speech_balloon_template.engine_balloon_module
     self.speech.extend self.speech_balloon_template.engine_speech_module
+  return false
     self.balloon.new_parent = self
     self.speech.new_parent = self
     self.extend_speech_balloon = if self.settings.blank?
@@ -149,10 +121,6 @@ class SpeechBalloon < Peta::Content
     'speech_balloons.updated_at desc'
   end
   
-  def self.list_opt
-    {:panel => {:author => {}}, :balloon => {}, :speech => {}, :speech_balloon_template => {} }
-  end
-  
   def self.list_json_opt
     {:include => {:panel => {:include => {:author => {} }}, :balloon => {}, :speech => {}, :speech_balloon_template => {} }}
   end