t#:

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

diff --git a/app/models/sheet_panel.rb b/app/models/sheet_panel.rb
index 8d6ea69..b2e15dd 100644 (file)
--- a/app/models/sheet_panel.rb
+++ b/app/models/sheet_panel.rb
@@ -12,8 +12,8 @@ class SheetPanel < ActiveRecord::Base
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
   def supply_default
-    self.sheet_id = nil
-    self.panel_id = nil
+#    self.sheet_id = nil
+#    self.panel_id = nil
     self.x = 15
     self.y = 15
     if self.sheet
@@ -366,7 +366,7 @@ class SheetPanel < ActiveRecord::Base
     end
     
     def tag_sheet_id
-      self.get_sheet.new_record? ? '0' : self.get_sheet.id.to_s
+      self.get_sheet == nil or self.get_sheet.new_record? ? '0' : self.get_sheet.id.to_s
     end
     
     def tag_element_id