Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

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

diff --git a/app/models/ground_color.rb b/app/models/ground_color.rb
index e750723..588196e 100644 (file)
--- a/app/models/ground_color.rb
+++ b/app/models/ground_color.rb
@@ -19,25 +19,6 @@ class GroundColor < Peta::Element
     }
   end
   
-  def self.list_opt_for_panel
-    {
-      :ground_colors => {
-      }
-    }
-  end
-  
-  def self.show_opt_for_panel
-    {
-      :ground_colors => {
-      }
-    }
-  end
-  
-  def self.json_opt_for_panel
-    {
-    }
-  end
-  
   def self.has_picture?
     false
   end
@@ -54,11 +35,6 @@ class GroundColor < Peta::Element
     self.panel_id = pid
   end
   
-  def visible? operators
-    return false unless super
-    self.owner_model.visible? operators
-  end
-  
   def div_offset
     xy ? xy : 0
   end
@@ -110,49 +86,14 @@ class GroundColor < Peta::Element
     r
   end
   
-  def self.list_where
+  def self.public_list_where list
     'panels.publish > 0'
   end
   
-  def self.list_order
-    'ground_colors.updated_at desc'
-  end
-  
-  def self.list_opt
-    {:panel => {:author => {}} }
-  end
-  
-  def self.list_json_opt
-    {:include => {:panel => {:include => {:author => {}}} }}
-  end
-  
   def self.show_opt
     {:include => {:panel => {:author => {}} }}
   end
   
-  def self.show_json_opt
-    {:include => {:panel => {:include => {:author => {}}} }}
-  end
-  
-  def store operators
-    if self.new_record?
-      self.panel.ground_colors.build(self.attributes)
-    else
-      self.panel.ground_colors.each do |ground_color|
-        next unless ground_color == self
-        attr = self.attributes
-        attr.delete 'id'
-        ground_color.attributes = attr
-        break
-      end
-    end
-    self.panel.store({}, operators)
-  end
-  
-  def remove operators
-    self.panel.remove_element(self, operators)
-  end
-  
   def scenario
     if caption.blank?
       ''