Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

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

diff --git a/app/models/panel.rb b/app/models/panel.rb
index c2e0b60..bbdf9ed 100644 (file)
--- a/app/models/panel.rb
+++ b/app/models/panel.rb
@@ -1,5 +1,5 @@
 #コマ
-class Panel < Peta::Content
+class Panel < Peta::Root
   load_manifest
   belongs_to :author
   has_many :scroll_panels
@@ -19,27 +19,6 @@ class Panel < Peta::Content
   validates :author_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :publish, :presence => true, :numericality => true
   
-  def self.each_element_class_names
-    Manifest.manifest.system_resources.elements.each do |k, n|
-      yield k
-    end
-  end
-  
-  def self.class_name_to_class k
-    Object.const_get k
-  end
-  
-  def self.each_element_classes
-    self.each_element_class_names do |k|
-      e = self.class_name_to_class k
-      yield e
-    end
-  end
-  
-  def elements_by_class_name class_name
-    self.__send__ class_name.tableize
-  end
-  
   def supply_default
     self.border = 2
     self.publish = 0
@@ -51,9 +30,15 @@ class Panel < Peta::Content
   end
   
   def visible? operators
-    return true if super
-    return true if self.new_record?
-    self.publish?
+    case super
+    when nil # super return
+      return true
+    when false
+      return false
+    else
+      return true if self.new_record?
+      self.publish?
+    end
   end
   
   def usable? operators
@@ -79,7 +64,7 @@ class Panel < Peta::Content
     }
   end
   
-  def self.list_where
+  def self.public_list_where
     'panels.publish > 0'
   end
   
@@ -91,8 +76,8 @@ class Panel < Peta::Content
     r = {
       :author => {}
     }
-    self.each_element_classes do |e|
-      r.merge!(e.list_opt_for_panel)
+    self.child_models.each do |child_model|
+      r.merge!(child_model.list_opt_for_panel)
     end
     r
   end
@@ -101,18 +86,14 @@ class Panel < Peta::Content
     r = {
       :author => {}
     }
-    self.each_element_classes do |e|
-      r.merge!(e.show_opt_for_panel)
+    self.child_models.each do |child_model|
+      r.merge!(child_model.show_opt_for_panel)
     end
     {:include => r}
   end
   
   def parts_element
-    r = []
-    self.class.each_element_class_names do |k|
-      r += (self.elements_by_class_name(k) || [])
-    end
-    r
+    self.elements_items
   end
   
   def zorderd_elements
@@ -181,14 +162,12 @@ class Panel < Peta::Content
   
   def self.collect_element_value elements, name
     elements.map {|e|
-      e.map {|o|
-        if o['_destroy'] or o[:_destroy]
-          nil
-        else
-          o[name]
-        end
-      }.compact
-    }.flatten
+      if e['_destroy'] or e[:_destroy]
+        nil
+      else
+        e[name]
+      end
+    }
   end
   
   def self.validate_serial ary, offset = 0
@@ -211,13 +190,9 @@ class Panel < Peta::Content
   end
   
   def validate_serial_list
-    l = []
-    self.class.each_element_class_names do |k|
-      l << self.elements_by_class_name(k)
-    end
     [
-      {:elements => l, :name => :t, :offset => 0}, 
-      {:elements => l, :name => :z, :offset => 1}
+      {:elements => self.elements_items, :name => :t, :offset => 0}, 
+      {:elements => self.elements_items, :name => :z, :offset => 1}
     ]
   end
   def validate_child
@@ -234,10 +209,7 @@ class Panel < Peta::Content
     self.overwrite operators
     res = false
     Panel.transaction do
-      self.panel_elements.each do |elm|
-        elm.new_panel = self
-        elm.boost
-      end
+      self.boosts 'post'
 #self.publish = nil
       res = self.save
       unless validate_child
@@ -282,23 +254,6 @@ class Panel < Peta::Content
     res
   end
   
-  def copy
-    attr = self.copy_attributes
-    Panel.each_element_class_names do |n|
-      attr.merge! Panel.class_name_to_class(n).panelize(self.elements_by_class_name(n).map {|elm|  elm.copy_attributes})
-    end
-    attr
-  end
-  
-  def copy_attributes
-    r = self.attributes
-    r.delete 'id'
-    r.delete 'author_id'
-    r.delete 'created_at'
-    r.delete 'updated_at'
-    r
-  end
-  
   def self.panelize panel
     attr = panel.attributes
     attr.delete 'id'