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 f8036bd..cb16e67 100644 (file)
--- a/app/models/ground_color.rb
+++ b/app/models/ground_color.rb
@@ -1,6 +1,5 @@
 class GroundColor < Peta::Element
   load_manifest
-  include ElementInspire
   belongs_to :panel
   belongs_to :color
   
@@ -12,6 +11,14 @@ class GroundColor < Peta::Element
   validates :z, :presence => true, :numericality => {:greater_than => 0}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
+  def self.by_author_list_includes
+    {
+      :panel => {
+        :author => {}
+      }
+    }
+  end
+  
   def self.list_opt_for_panel
     {
       :ground_colors => {
@@ -47,11 +54,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
@@ -103,7 +105,7 @@ class GroundColor < Peta::Element
     r
   end
   
-  def self.list_where
+  def self.public_list_where
     'panels.publish > 0'
   end