fix play leaf

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

diff --git a/app/models/comic.rb b/app/models/comic.rb
index 5b7f9dc..9821ae2 100644 (file)
--- a/app/models/comic.rb
+++ b/app/models/comic.rb
@@ -1,7 +1,7 @@
 #コミック
-class Comic < Peta::Content
+class Comic < Peta::Binder
   load_manifest
-  has_many :stories, :order => 't'
+  has_many :comic_stories
   belongs_to :author
   
   validates :title, :presence => true, :length => {:maximum => 100}
@@ -32,10 +32,6 @@ class Comic < Peta::Content
     end
   end
   
-  def comic_stories_count
-    Story.where(['stories.comic_id = ?', self.id]).count
-  end
-  
   def symbol_filename
   end
   
@@ -48,19 +44,19 @@ class Comic < Peta::Content
   end
   
   def self.list_opt
-    {:stories => {}, :author => {} }
+    {:comic_stories => {:story => {}}, :author => {} }
   end
   
   def self.list_json_opt
-    {:include => {:stories => {}, :author => {}} }
+    {:include => {:comic_stories => {:include => {:story => {}}}, :author => {}}}
   end
   
   def self.show_opt
-    {:include => {:stories => {}, :author => {}} }
+    {:include => {:comic_stories => {:story => {}}, :author => {}}}
   end
   
   def self.show_json_opt
-    {:include => {:stories => {}, :author => {}} }
+    {:include => {:comic_stories => {:include => {:story => {}}}, :author => {}}}
   end
   
   def tag_attributes column = nil, opt = {}
@@ -68,18 +64,6 @@ class Comic < Peta::Content
     }
   end
   
-  def destroy_with_story
-    res = false
-    Comic.transaction do
-      self.stories.each do |story|
-        raise ActiveRecord::Rollback unless story.destroy_and_shorten
-      end
-      raise ActiveRecord::Rollback unless self.destroy
-      res = true
-    end
-    res
-  end
-  
   def scenario
     panels.map {|panel|
       panel.scenario