Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

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

diff --git a/app/models/sheet.rb b/app/models/sheet.rb
index ee85e6f..a07bbea 100644 (file)
--- a/app/models/sheet.rb
+++ b/app/models/sheet.rb
@@ -1,4 +1,4 @@
-class Sheet < Peta::Content
+class Sheet < Peta::Root
   load_manifest
   has_many :sheet_panels
   has_many :story_sheets
@@ -41,9 +41,14 @@ class Sheet < Peta::Content
   end
   
   def visible? operators
-    return false unless super
-    return true if self.new_record?
-    self.visible > 0
+    case super
+    when nil # super return
+      return true
+    when false
+      return false
+    else
+      self.visible > 0
+    end
   end
   
   def usable? operators
@@ -53,19 +58,7 @@ class Sheet < Peta::Content
   def symbol_filename
   end
   
-  def tag_id
-    'sheet' + self.tag_sheet_id
-  end
-  
-  def tag_sheet_id
-    self.new_record? ? '0' : self.id.to_s
-  end
-  
-  def field_tag_id f
-    self.tag_id + f.to_s
-  end
-  
-  def self.list_where
+  def self.public_list_where
     'sheets.visible > 0'
   end
   
@@ -173,16 +166,6 @@ class Sheet < Peta::Content
     Sheet.validate_elements_serial validate_serial_list
   end
   
-  def boost
-    @new_element_index = 0
-    self.panel_elements.each do |elm|
-      if elm.new_record?
-        elm.new_index = @new_element_index
-        @new_element_index += 1
-      end
-    end
-  end 
-  
   def store attr, operators
     if attr == false
       self.errors.add :base, I18n.t('errors.invalid_json')