fic picture publishing

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

diff --git a/app/models/comic.rb b/app/models/comic.rb
index 92f1568..5b7f9dc 100644 (file)
--- a/app/models/comic.rb
+++ b/app/models/comic.rb
@@ -1,5 +1,6 @@
 #コミック
 class Comic < Peta::Content
+  load_manifest
   has_many :stories, :order => 't'
   belongs_to :author
   
@@ -7,10 +8,6 @@ class Comic < Peta::Content
   validates :visible, :presence => true, :numericality => true, :inclusion => {:in => 0..1}
   validates :author_id, :presence => true, :numericality => true, :existence => {:both => false}
   
-  def self.valid_encode_columns
-    super + ['title', 'description']
-  end
-  
   def self.visible_count_options
     {:conditions => 'visible > 0'}
   end
@@ -25,8 +22,14 @@ class Comic < Peta::Content
   end
   
   def visible? operators
-    return false unless super
-    self.visible > 0
+    case super
+    when nil # super return
+      return true
+    when false
+      return false
+    else
+      self.visible > 0
+    end
   end
   
   def comic_stories_count
@@ -36,7 +39,7 @@ class Comic < Peta::Content
   def symbol_filename
   end
   
-  def self.list_where
+  def self.public_list_where
     'comics.visible > 0'
   end