merge:

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

diff --git a/app/models/story_sheet.rb b/app/models/story_sheet.rb
index f49d6b0..6acadc8 100644 (file)
--- a/app/models/story_sheet.rb
+++ b/app/models/story_sheet.rb
@@ -1,12 +1,10 @@
 class StorySheet < Peta::Leaf
   load_manifest
-  belongs_to :author
   belongs_to :story
   belongs_to :sheet
   
   validates :story_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :sheet_id, :presence => true, :numericality => true, :existence => {:both => false}
-  validates :author_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
   def supply_default
@@ -15,12 +13,7 @@ class StorySheet < Peta::Leaf
     self.t = nil
   end
   
-  def overwrite operators
-    return false unless operators.author
-    self.author_id = operators.author.id
-  end
-  
-  def self.public_list_where
+  def self.public_list_where list
     'stories.visible > 0'
   end
   
@@ -34,7 +27,6 @@ class StorySheet < Peta::Leaf
   
   def self.show_opt
     {:include => {
-      :author => {}, 
       :story => {}, 
       :sheet => {
         :author => {} 
@@ -42,38 +34,9 @@ class StorySheet < Peta::Leaf
     }}
   end
   
-  def self.show_json_opt
-    {:include => {
-      :author => {}, 
-      :story => {} ,
-      :sheet => {:include => {:author => {}}} 
-    }}
-  end
-  
   def allow? operators
     return nil if self.story_id == nil or self.sheet_id == nil
     self.story.own?(operators) and self.sheet.usable?(operators)
   end
   
-  def store operators, old_t = nil
-    res = false
-    self.class.transaction do
-      case self.allow? operators
-      when true
-        self.rotate old_t
-      when false
-        raise ActiveRecord::Forbidden
-      else
-      end
-      res = self.save
-      raise ActiveRecord::Rollback unless res
-      res = self.class.validate_t(self.story_id) 
-      unless res
-        self.errors.add :t, 'unserialized'
-        raise ActiveRecord::Rollback 
-      end
-    end
-    res
-  end
-  
 end