fix form

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

diff --git a/app/models/speech_balloon.rb b/app/models/speech_balloon.rb
index 06e1881..dde1ed1 100644 (file)
--- a/app/models/speech_balloon.rb
+++ b/app/models/speech_balloon.rb
@@ -1,5 +1,5 @@
-class SpeechBalloon < ActiveRecord::Base
-  include Element
+class SpeechBalloon < Peta::Content
+  include Peta::Element
   include ElementInspire
   has_one :balloon, :dependent => :destroy
   has_one :speech, :dependent => :destroy
@@ -16,13 +16,12 @@ class SpeechBalloon < ActiveRecord::Base
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   validates :settings, :extend_speech_balloon => true
   
-  before_validation :valid_encode
+  def self.owner_model
+    Panel
+  end
   
-  def valid_encode
-    ['caption', 'classname', 'settings'].each do |a|
-      next if attributes[a] == nil
-      raise Pettanr::BadRequest unless attributes[a].valid_encoding?
-    end
+  def self.valid_encode_columns
+    super + ['caption', 'classname', 'settings']
   end
   
   def self.list_opt_for_panel
@@ -47,6 +46,10 @@ class SpeechBalloon < ActiveRecord::Base
     false
   end
   
+  def extend_column
+    'classname'
+  end
+  
   def supply_default
     if self.panel
       self.t = self.panel.new_t 
@@ -58,17 +61,16 @@ class SpeechBalloon < ActiveRecord::Base
     self.panel_id = pid
   end
   
-  def visible? roles
-    if MagicNumber['run_mode'] == 0
-      return false unless guest_role_check(roles)
-    else
-      return false unless reader_role_check(roles)
-    end
-    return true if self.panel.own?(roles)
-    self.panel.visible? roles
+  def visible? operators
+    return false unless super
+    self.owner_model.visible? operators
+  end
+  
+  def symbol_option
+    self.speech_balloon_template.symbol_option
   end
   
-  def new_sballoon
+  def new_balloon
     @new_balloon
   end
   
@@ -139,61 +141,12 @@ class SpeechBalloon < ActiveRecord::Base
     'speech_balloon'
   end
   
-  def self.default_page_size
-    25
-  end
-  
-  def self.max_page_size
-    100
-  end
-  
-  def self.page prm = nil
-    page = prm.to_i
-    page = 1 if page < 1
-    page
-  end
-  
-  def self.page_size prm = self.default_page_size
-    page_size = prm.to_i
-    page_size = self.max_page_size if page_size > self.max_page_size
-    page_size = self.default_page_size if page_size < 1
-    page_size
-  end
-  
   def self.list_where
     'panels.publish > 0'
   end
   
-  def self.mylist_where au
-    ['panels.author_id = ?', au.id]
-  end
-  
-  def self.himlist_where au
-    ['panels.author_id = ? and panels.publish > 0', au.id]
-  end
-  
-  def self.list page = 1, page_size = self.default_page_size
-    SpeechBalloon.where(self.list_where()).includes(SpeechBalloon.list_opt).order('speech_balloons.updated_at desc').offset((page -1) * page_size).limit(page_size)
-  end
-  
-  def self.mylist au, page = 1, page_size = Author.default_speech_balloon_page_size
-    SpeechBalloon.where(self.mylist_where(au)).includes(SpeechBalloon.list_opt).order('speech_balloons.updated_at desc').offset((page -1) * page_size).limit(page_size)
-  end
-  
-  def self.himlist au, page = 1, page_size = Author.default_speech_balloon_page_size
-    SpeechBalloon.where(self.himlist_where(au)).includes(SpeechBalloon.list_opt).order('speech_balloons.updated_at desc').offset((page -1) * page_size).limit(page_size)
-  end
-  
-  def self.list_paginate page = 1, page_size = self.default_page_size
-    Kaminari.paginate_array(Array.new(SpeechBalloon.where(self.list_where()).includes(SpeechBalloon.list_opt).count, nil)).page(page).per(page_size)
-  end
-  
-  def self.mylist_paginate au, page = 1, page_size = Author.default_speech_balloon_page_size
-    Kaminari.paginate_array(Array.new(SpeechBalloon.where(self.mylist_where(au)).includes(SpeechBalloon.list_opt).count, nil)).page(page).per(page_size)
-  end
-  
-  def self.himlist_paginate au, page = 1, page_size = Author.default_speech_balloon_page_size
-    Kaminari.paginate_array(Array.new(SpeechBalloon.where(self.himlist_where(au)).includes(SpeechBalloon.list_opt).count, nil)).page(page).per(page_size)
+  def self.list_order
+    'speech_balloons.updated_at desc'
   end
   
   def self.list_opt
@@ -204,14 +157,6 @@ class SpeechBalloon < ActiveRecord::Base
     {:include => {:panel => {:include => {:author => {} }}, :balloon => {}, :speech => {}, :speech_balloon_template => {} }}
   end
   
-  def self.show cid, au
-    opt = {}
-    opt.merge!(SpeechBalloon.show_opt)
-    res = SpeechBalloon.find(cid, opt)
-    raise ActiveRecord::Forbidden unless res.visible?(au)
-    res
-  end
-  
   def self.show_opt
     {:include => {:panel => {:author => {}}, :balloon => {}, :speech => {}, :speech_balloon_template => {} }}
   end
@@ -220,7 +165,7 @@ class SpeechBalloon < ActiveRecord::Base
     {:include => {:panel => {:include => {:author => {} }}, :balloon => {}, :speech => {}, :speech_balloon_template => {} }}
   end
   
-  def store au, attr
+  def store operators, attr
     if self.new_record?
       sb = self.panel.speech_balloons.build
       sb.attributes = attr
@@ -232,7 +177,7 @@ class SpeechBalloon < ActiveRecord::Base
         break
       end
     end
-    self.panel.store({}, au)
+    self.panel.store({}, operators)
   end
   
   def remove au