[Erp5-report] r20228 - /erp5/trunk/products/ERP5Form/Form.py

[nobody at svn.erp5.org]

Author: yusei
Date: Mon Mar 31 14:58:57 2008
New Revision: 20228

URL: http://svn.erp5.org?rev=20228&view=rev
Log:
Show all same type fields in default form library.

Modified:
    erp5/trunk/products/ERP5Form/Form.py

Modified: erp5/trunk/products/ERP5Form/Form.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Form.py?rev=20228&r1=20227&r2=20228&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Form.py (original)
+++ erp5/trunk/products/ERP5Form/Form.py Mon Mar 31 14:58:57 2008
@@ -740,13 +740,13 @@
                                     'proxy_flag':proxy_flag,
                                     'matched_rate':0
                                     }
-                    if not default_field_library_path in form_order:
-                        matched_append(default_field_library_path,
-                                       matched_item)
-                    if not default_field_library_path in \
-                                          perfect_matched_form_order:
-                        perfect_matched_append(default_field_library_path,
-                                               matched_item)
+
+                    if not i in [item['field_object']
+                                 for item in matched.get(default_field_library_path, ())]:
+                      matched_append(default_field_library_path, matched_item)
+                    if not i in [item['field_object']
+                                 for item in perfect_matched.get(default_field_library_path, ())]:
+                      perfect_matched_append(default_field_library_path, matched_item)
 
         id_ = field.getId()
         meta_type = field.meta_type