fix extend

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

diff --git a/app/models/speech_balloon.rb b/app/models/speech_balloon.rb
index 5077550..875041a 100644 (file)
--- a/app/models/speech_balloon.rb
+++ b/app/models/speech_balloon.rb
@@ -1,6 +1,5 @@
 class SpeechBalloon < Peta::Element
   load_manifest
-  include ElementInspire
   has_one :balloon, :dependent => :destroy
   has_one :speech, :dependent => :destroy
   belongs_to :speech_balloon_template
@@ -16,6 +15,14 @@ class SpeechBalloon < Peta::Element
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   validates :settings, :extend_speech_balloon => true
   
+  def self.by_author_list_includes
+    {
+      :panel => {
+        :author => {}
+      }
+    }
+  end
+  
   def self.list_opt_for_panel
     {
       :speech_balloons => {:balloon => {}, :speech => {}}
@@ -58,73 +65,6 @@ class SpeechBalloon < Peta::Element
     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_extend_module
-    if self.balloon
-    else
-      self.new_balloon = self.build_balloon 
-      self.new_speech = self.build_speech 
-    end
-    self.balloon.extend self.speech_balloon_template.engine_balloon_module
-    self.speech.extend self.speech_balloon_template.engine_speech_module
-    self.balloon.new_parent = self
-    self.speech.new_parent = self
-    self.extend_speech_balloon = if self.settings.blank?
-      {}
-    else
-      JSON.parse(self.settings)
-    end
-    self.balloon.extend_balloon = if self.balloon.settings.blank?
-      {}
-    else
-      JSON.parse(self.get_balloon.settings)
-    end
-    self.speech.extend_speech = if self.speech.settings.blank?
-      {}
-    else
-      JSON.parse(self.get_speech.settings)
-    end
-  end
-  
-  def self.fold_extend_settings params
-    speech_balloon_settings = params[:speech_balloon][:settings]
-    if speech_balloon_settings.is_a?(Hash)
-      params[:speech_balloon][:settings] = speech_balloon_settings.to_json
-    end
-    balloon_settings = params[:speech_balloon][:balloon_attributes][:settings]
-    if balloon_settings.is_a?(Hash)
-      params[:speech_balloon][:balloon_attributes][:settings] = balloon_settings.to_json
-    end
-    speech_settings = params[:speech_balloon][:speech_attributes][:settings]
-    if speech_settings.is_a?(Hash)
-      params[:speech_balloon][:speech_attributes][:settings] = speech_settings.to_json
-    end
-  end
-  
   def tag_element_type
     'speech_balloon'
   end
@@ -137,10 +77,6 @@ class SpeechBalloon < Peta::Element
     '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