t#30009:fix views

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

diff --git a/app/models/comic.rb b/app/models/comic.rb
index 7c937b1..f32b0bd 100644 (file)
--- a/app/models/comic.rb
+++ b/app/models/comic.rb
@@ -1,31 +1,34 @@
+#コミック
 class Comic < ActiveRecord::Base
   has_many :stories
   belongs_to :author
   
   validates :title, :presence => true, :length => {:maximum => 100}
-  validates :width, :presence => true, :numericality => true, :natural_number => true
-  validates :height, :presence => true, :numericality => true, :natural_number => true
-  validates :visible, :presence => true, :numericality => true, :inclusion => {:in => 0..3}
-  
-  before_save do |r|
-    r.supply_default
-  end
+  validates :visible, :presence => true, :numericality => true, :inclusion => {:in => 0..1}
   
   def supply_default
     self.visible = 0 if self.visible.blank?
   end
   
-  def own? author
-    return false unless author
-    self.author_id == author.id
+  def overwrite au
+    return false unless au
+    self.author_id = au.id
   end
   
-  def visible? author
-    self.visible > 0 or self.own?(author)
+  def own? au
+    return false unless au.is_a?(Author)
+    self.author_id == au.id
   end
   
-  def disp_visible
-    visible == 1 ? 'O' : 'X'
+  def visible? au
+    if au == nil
+      return false if MagicNumber['run_mode'] == 1
+    elsif au.is_a?(Author)
+      return true if self.own?(au)
+    else
+      return false
+    end
+    self.visible > 0
   end
   
   def self.default_page_size
@@ -57,9 +60,11 @@ class Comic < ActiveRecord::Base
     page_size
   end
   
-  def self.list opt = {}, page = 1, page_size = self.default_page_size
-    opt.merge!(self.list_opt) unless opt[:include]
-    opt.merge!({:conditions => ['visible > 0'], :order => 'updated_at desc', :limit => page_size, :offset => (page -1) * page_size})
+  def self.list page = 1, page_size = self.default_page_size
+    opt = {}
+    opt.merge!(Comic.list_opt)
+    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
+    opt.merge!({:conditions => ['visible > 0'], :order => 'updated_at desc'})
     Comic.find(:all, opt)
   end
   
@@ -68,25 +73,41 @@ class Comic < ActiveRecord::Base
   end
   
   def self.list_json_opt
-    {:include => {:stories => {:panel => {}}, :author => {}}}
+    {:include => {:stories => {:include => {:panel => {}}}, :author => {}}}
   end
   
-  def self.show cid, au, opt = {}
-    c = Comic.find(cid, :include => self.show_include_opt(opt))
-    raise ActiveRecord::Forbidden unless c.visible?(au)
-    c
+  def self.mylist au, page = 1, page_size = Author.default_comic_page_size
+    opt = {}
+    opt.merge!(Comic.list_opt)
+    opt.merge!({:limit => page_size, :offset => (page -1) * page_size}) if page_size > 0
+    opt.merge!({:conditions => ['comics.author_id = ?', au.id], :order => 'comics.updated_at desc'})
+    Comic.find(:all, opt)
   end
   
-  def self.show_include_opt opt = {}
-    res = {:stories => {:panel => {}}, :author => {}}
-    res.push(opt[:include]) if opt[:include]
+  def self.show cid, au
+    opt = {}
+    opt.merge!(Comic.show_opt)
+    res = Comic.find(cid, opt)
+    raise ActiveRecord::Forbidden unless res.visible?(au)
     res
   end
   
-  def self.show_json_include_opt
+  def self.edit cid, au
+    opt = {}
+    opt.merge!(Comic.show_opt)
+    res = Comic.find(cid, opt)
+    raise ActiveRecord::Forbidden unless res.own?(au)
+    res
+  end
+  
+  def self.show_opt
     {:include => {:stories => {:panel => {}}, :author => {}}}
   end
   
+  def self.show_json_opt
+    {:include => {:stories => {:include => {:panel => {}}}, :author => {}}}
+  end
+  
   def self.visible_count
     Comic.count 'visible > 0'
   end