e

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

diff --git a/app/models/sheet_panel.rb b/app/models/sheet_panel.rb
index 3af5219..300980c 100644 (file)
--- a/app/models/sheet_panel.rb
+++ b/app/models/sheet_panel.rb
@@ -1,4 +1,5 @@
-class SheetPanel < Pettanr::Content
+class SheetPanel < Peta::Element
+  load_manifest
   belongs_to :author
   belongs_to :panel
   belongs_to :sheet
@@ -12,10 +13,6 @@ class SheetPanel < Pettanr::Content
   validates :z, :presence => true, :numericality => {:greater_than => 0}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
-  def owner_model
-    self.sheet
-  end
-  
   def supply_default
     self.x = 15
     self.y = 15
@@ -30,9 +27,9 @@ class SheetPanel < Pettanr::Content
     end
   end
   
-  def overwrite au
-    return false unless au
-    self.author_id = au.id
+  def overwrite operators
+    return false unless operators.author
+    self.author_id = operators.author.id
   end
   
   def visible? operators
@@ -158,9 +155,9 @@ class SheetPanel < Pettanr::Content
     end
   end
   
-  def boost au
+  def boost operators
     if self.panel
-      self.panel.author_id = au.id
+      self.panel.author_id = operators.author.id
       self.panel.panel_elements.each do |elm|
         elm.new_panel = self
         elm.boost
@@ -246,15 +243,15 @@ class SheetPanel < Pettanr::Content
     end
   end
   
-  def allow?
+  def allow? operators
     return nil if self.sheet_id == nil or self.panel_id == nil
-    self.sheet.own?(self.author) and self.panel.usable?(self.author)
+    self.sheet.own?(operators) and self.panel.usable?(operators)
   end
   
-  def store old_t = nil
+  def store operators, old_t = nil
     res = false
     SheetPanel.transaction do
-      case self.allow?
+      case self.allow? operators
       when true
         self.rotate old_t
       when false
@@ -321,7 +318,7 @@ class SheetPanel < Pettanr::Content
     end
     
     def tag_sheet_id
-      self.get_sheet == nil or 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