comic test ok

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

diff --git a/app/models/comic.rb b/app/models/comic.rb
index 7e6743d..8dccc58 100644 (file)
--- a/app/models/comic.rb
+++ b/app/models/comic.rb
@@ -28,6 +28,10 @@ class Comic < ActiveRecord::Base
     self.author_id == author.id
   end
   
+  def vis author
+    self.own?(author) or self.visible > 0
+  end
+  
   def disp_editable
     editable == 1 ? 'O' : 'X'
   end
@@ -49,8 +53,7 @@ class Comic < ActiveRecord::Base
     page_size = self.default_page_size if page_size < 1
     page = 1 if page < 1
     opt.merge!(self.list_opt) unless opt[:include]
-    opt.merge!({:conditions => ['visible = 1'], :order => 'updated_at desc', :limit => page_size, :offset => (page -1) * page_size})
-    p opt
+    opt.merge!({:conditions => ['visible > 0'], :order => 'updated_at desc', :limit => page_size, :offset => (page -1) * page_size})
     Comic.find(:all, opt)
   end
   
@@ -58,8 +61,39 @@ class Comic < ActiveRecord::Base
     {:include => :author}
   end
   
-  def self.json_opt
+  def self.list_json_opt
+    {:include => :author}
+  end
+  
+  def self.show cid, opt = {}
+    opt.merge!(self.show_opt) unless opt[:include]
+    Comic.find(cid, opt)
+  end
+  
+  def self.show_opt
+    {:include => :author}
+  end
+  
+  def self.show_json_opt
     {:include => :author}
   end
   
+  def self.play cid, opt = {}
+    Comic.find(cid, include: [
+      :author, 
+      :panels => [
+        :panel_pictures => :resource_picture, 
+        :balloons => :speaches
+      ]
+    ], order: 'panels.t, speaches.t')
+  end
+  
+  def to_json_play
+    self.to_json( :include => {:author => {}, :panels => {:methods => :panel_element}})
+  end
+  
+  def self.visible_count
+    Comic.count 'visible > 0'
+  end
+  
 end