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 ad3ba44..bbdf9ed 100644 (file)
--- a/app/models/panel.rb
+++ b/app/models/panel.rb
@@ -162,14 +162,12 @@ class Panel < Peta::Root
   
   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
@@ -199,7 +197,6 @@ class Panel < Peta::Root
   end
   def validate_child
 #    r1 = Panel.validate_elements_id validate_id_list
-      return true
     Panel.validate_elements_serial validate_serial_list
   end