fix form

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

diff --git a/app/models/ground_color.rb b/app/models/ground_color.rb
index 2f61ce1..85f0dc2 100644 (file)
--- a/app/models/ground_color.rb
+++ b/app/models/ground_color.rb
@@ -1,5 +1,5 @@
-class GroundColor < ActiveRecord::Base
-  include Element
+class GroundColor < Peta::Content
+  include Peta::Element
   include ElementInspire
   belongs_to :panel
   belongs_to :color
@@ -12,13 +12,12 @@ class GroundColor < ActiveRecord::Base
   validates :z, :presence => true, :numericality => {:greater_than => 0}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
-  before_validation :valid_encode
+  def self.owner_model
+    Panel
+  end
   
-  def valid_encode
-    ['caption'].each do |a|
-      next if attributes[a] == nil
-      raise Pettanr::BadRequest unless attributes[a].valid_encoding?
-    end
+  def self.valid_encode_columns
+    super + ['caption']
   end
   
   def self.colum_structures
@@ -64,14 +63,9 @@ class GroundColor < 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 div_offset
@@ -126,69 +120,12 @@ class GroundColor < ActiveRecord::Base
     'ground_color'
   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
-    GroundColor.where(self.list_where()).includes(GroundColor.list_opt).order('ground_colors.updated_at desc').offset((page -1) * page_size).limit(page_size)
-  end
-  
-  def self.mylist au, page = 1, page_size = Author.default_ground_color_page_size
-    GroundColor.where(self.mylist_where(au)).includes(GroundColor.list_opt).order('ground_colors.updated_at desc').offset((page -1) * page_size).limit(page_size)
-  end
-  
-  def self.himlist au, page = 1, page_size = Author.default_ground_color_page_size
-    GroundColor.where(self.himlist_where(au)).includes(GroundColor.list_opt).order('ground_colors.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(GroundColor.where(self.list_where()).includes(GroundColor.list_opt).count, nil)).page(page).per(page_size)
-  end
-  
-  def self.mylist_paginate au, page = 1, page_size = Author.default_ground_color_page_size
-    Kaminari.paginate_array(Array.new(GroundColor.where(self.mylist_where(au)).includes(GroundColor.list_opt).count, nil)).page(page).per(page_size)
-  end
-  
-  def self.himlist_paginate au, page = 1, page_size = Author.default_ground_color_page_size
-    Kaminari.paginate_array(Array.new(GroundColor.where(self.himlist_where(au)).includes(GroundColor.list_opt).count, nil)).page(page).per(page_size)
-  end
-  
-  def self.list_by_panel_where panel_id
-    ['ground_colors.panel_id = ?', panel_id]
-  end
-  
-  def self.list_by_panel panel_id, roles, page = 1, page_size = self.default_page_size
-    self.where(self.list_by_panel_where(panel_id)).includes(self.list_opt).order('ground_colors.updated_at desc').offset((page -1) * page_size).limit(page_size)
+  def self.list_order
+    'ground_colors.updated_at desc'
   end
   
   def self.list_opt
@@ -199,14 +136,6 @@ class GroundColor < ActiveRecord::Base
     {:include => {:panel => {:include => {:author => {}}} }}
   end
   
-  def self.show cid, roles
-    opt = {}
-    opt.merge!(GroundColor.show_opt)
-    res = GroundColor.find(cid, opt)
-    raise ActiveRecord::Forbidden unless res.visible?(roles)
-    res
-  end
-  
   def self.show_opt
     {:include => {:panel => {:author => {}} }}
   end
@@ -215,7 +144,7 @@ class GroundColor < ActiveRecord::Base
     {:include => {:panel => {:include => {:author => {}}} }}
   end
   
-  def store au
+  def store operators
     if self.new_record?
       self.panel.ground_colors.build(self.attributes)
     else
@@ -227,11 +156,11 @@ class GroundColor < ActiveRecord::Base
         break
       end
     end
-    self.panel.store({}, au)
+    self.panel.store({}, operators)
   end
   
-  def remove au
-    self.panel.remove_element(self, au)
+  def remove operators
+    self.panel.remove_element(self, operators)
   end
   
   def scenario