t#31326:drop color

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

diff --git a/app/models/ground_color.rb b/app/models/ground_color.rb
index de02c7b..98de711 100644 (file)
--- a/app/models/ground_color.rb
+++ b/app/models/ground_color.rb
@@ -3,7 +3,7 @@ class GroundColor < ActiveRecord::Base
   belongs_to :color
   
   validates :panel_id, :numericality => {:allow_blank => true}
-  validates :color_id, :numericality => true, :existence => {:both => false}
+  validates :code, :presence => true, :numericality => {:greater_than_or_equal_to => 0, :less_than => 0x1000000}
   validates :z, :presence => true, :numericality => {:greater_than => 0}
   
   def supply_default
@@ -68,11 +68,11 @@ class GroundColor < ActiveRecord::Base
   end
   
   def self.list_opt
-    {:include => {:panel => {:author => {}}, :color => {} }}
+    {:include => {:panel => {:author => {}} }}
   end
   
   def self.list_json_opt
-    {:include => {:panel => {:include => {:author => {}}}, :color => {} }}
+    {:include => {:panel => {:include => {:author => {}}} }}
   end
   
   def self.show cid, roles
@@ -84,11 +84,11 @@ class GroundColor < ActiveRecord::Base
   end
   
   def self.show_opt
-    {:include => {:panel => {:author => {}}, :color => {} }}
+    {:include => {:panel => {:author => {}} }}
   end
   
   def self.show_json_opt
-    {:include => {:panel => {:include => {:author => {}}}, :color => {} }}
+    {:include => {:panel => {:include => {:author => {}}} }}
   end
   
   def scenario