t#31834:new base

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

diff --git a/app/models/ground_color.rb b/app/models/ground_color.rb
index 057d1d0..7117e4b 100644 (file)
--- a/app/models/ground_color.rb
+++ b/app/models/ground_color.rb
@@ -65,7 +65,27 @@ class GroundColor < ActiveRecord::Base
   
   def opt_div_style spot = nil, opacity = 20
     o = (spot and spot != self) ? "opacity: #{opacity.to_f/100}; filter:alpha(opacity=#{opacity});" : ''
-    "position: absolute; width:#{self.panel.width}px; height:#{self.panel.height}px; z-index:#{self.z}; background-color:##{format("%06x", self.code)}; #{o}"
+    "position: absolute; width:#{self.get_panel.width}px; height:#{self.get_panel.height}px; z-index:#{self.z}; background-color:##{format("%06x", self.code)}; #{o}"
+  end
+  
+  def new_index
+    @new_index
+  end
+  
+  def new_index= v
+    @new_index = v
+  end
+  
+  def new_panel
+    @new_panel
+  end
+  
+  def new_panel= v
+    @new_panel = v
+  end
+  
+  def get_panel
+    self.panel || @new_panel
   end
   
   def tag_id c = nil
@@ -77,7 +97,7 @@ class GroundColor < ActiveRecord::Base
   end
   
   def tag_panel_id
-    self.panel.new_record? ? '0' : self.panel.id.to_s
+    self.get_panel.new_record? ? '0' : self.get_panel.id.to_s
   end
   
   def tag_element_id
@@ -88,8 +108,8 @@ class GroundColor < ActiveRecord::Base
     'ground_color'
   end
   
-  def field_tree f
-    'panels-' + self.tag_panel_id + '-ground_colors_attributes-' + self.tag_element_id + '-' + f.to_s
+  def tag_new_index
+    self.new_index.to_s
   end
   
   def self.default_page_size