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 0a59dbd..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,16 +31,12 @@ class Story < Peta::Binder
     end
   end
   
-  def self.public_list_where
+  def self.public_list_where list
     'stories.visible > 0'
   end
   
   def self.show_opt
-    {:include => {:comic_stories => {:comic => {}}, :author => {}}}
-  end
-  
-  def self.show_json_opt
-    {:include => {:comic_stories => {:include => {:comic => {}}}, :author => {}}}
+    {:include => {:story_sheets => {:sheet => {}}, :author => {}}}
   end
   
 end