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

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

diff --git a/app/models/story.rb b/app/models/story.rb
index 1410b11..7c3354d 100644 (file)
--- a/app/models/story.rb
+++ b/app/models/story.rb
@@ -11,6 +11,7 @@ class Story < Peta::Binder
   
   def supply_default
     self.visible = 0 if self.visible.blank?
+    self.author_id = nil
   end
   
   def overwrite operators
@@ -30,142 +31,12 @@ class Story < Peta::Binder
     end
   end
   
-  def story_sheets_count
-    StorySheet.where(['story_sheets.story_id = ?', self.id]).count
-  end
-  
-  def self.public_list_where
+  def self.public_list_where list
     'stories.visible > 0'
   end
   
-  def self.list_order
-    'stories.updated_at desc'
-  end
-  
-  def self.list_opt
-    {:comic_stories => {:comic => {}}, :author => {} }
-  end
-  
-  def self.list_json_opt
-    {:include => {:comic_stories => {:include => {:comic => {}}}, :author => {}}}
-  end
-  
   def self.show_opt
-    {:include => {:comic_stories => {:comic => {}}, :author => {}}}
-  end
-  
-  def self.show_json_opt
-    {:include => {:comic_stories => {:include => {:comic => {}}}, :author => {}}}
-  end
-  
-  def self.visible_count
-    Story.count 'visible > 0'
-  end
-  
-  def destroy_with_story_sheet
-    res = false
-    Story.transaction do
-      self.story_sheets.each do |story_sheet|
-        raise ActiveRecord::Rollback unless story_sheet.destroy
-      end
-      raise ActiveRecord::Rollback unless self.destroy
-      res = true
-    end
-    res
-  end
-  
-  def parts_element
-    self.leafs_items
-  end
-  
-  def zorderd_elements
-    res = []
-    self.parts_element.each do |e|
-      res[e.z-1] = e
-    end
-    res
-  end
-  
-  def story_elements
-    res = []
-    self.parts_element.each do |e|
-      res[e.t] = e
-    end
-    res
-  end
-  
-  def self.collect_element_value elements, name
-    elements.map {|e|
-      if e['_destroy'] or e[:_destroy]
-        nil
-      else
-        e[name]
-      end
-    }
-  end
-  
-  def self.validate_serial ary, offset = 0
-    i = offset
-    ary.compact.sort.each do |n|
-      break false unless n == i
-      i += 1
-    end
-    ary.compact.size == i - offset
-  end
-  
-  def self.validate_element_serial elements, name, offset = 0
-    self.validate_serial(self.collect_element_value(elements, name), offset)
-  end
-  
-  def self.validate_elements_serial c
-    c.map {|conf|
-      self.validate_element_serial(conf[:elements], conf[:name], conf[:offset]) ? nil : false
-    }.compact.empty?
-  end
-  
-  def validate_serial_list
-    [
-      {:elements => self.leafs_items, :name => :t, :offset => 0}, 
-      {:elements => self.leafs_items, :name => :z, :offset => 1}
-    ]
-  end
-  def validate_child
-#    r1 = Panel.validate_elements_id validate_id_list
-    self.class.validate_elements_serial validate_serial_list
+    {:include => {:story_sheets => {:sheet => {}}, :author => {}}}
   end
   
-  def store attr, operators
-    if attr == false
-      self.errors.add :base, I18n.t('errors.invalid_json')
-      return false
-    end
-    self.attributes = attr
-    self.overwrite operators
-    res = false
-    Story.transaction do
-      self.story_elements.each do |elm|
-        elm.new_story = self
-        elm.boost operators
-      end
-      res = self.save
-      unless validate_child
-        res = false
-        self.errors.add :base, I18n.t('errors.invalid_t')
-        raise ActiveRecord::Rollback
-      end
-    end
-    res
-  end
-  
-  def destroy_and_shorten
-    res = false
-    Story.transaction do
-      Story.update_all('t = t - 1', ['comic_id = ? and (t > ?)', self.comic_id, self.t])
-      raise ActiveRecord::Rollback unless self.destroy_with_story_sheet
-      res = true
-    end
-    res
-  end
-  
-  
 end