[Erp5-report] r30902 - /erp5/trunk/products/ERP5/mixin/property_recordable.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Fri Nov 27 17:14:22 2009
New Revision: 30902

URL: http://svn.erp5.org?rev=30902&view=rev
Log:
use getProperty or getPropertyList appropriately instead of using getPropertyList everywhere.

Modified:
    erp5/trunk/products/ERP5/mixin/property_recordable.py

Modified: erp5/trunk/products/ERP5/mixin/property_recordable.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/mixin/property_recordable.py?rev=30902&r1=30901&r2=30902&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/mixin/property_recordable.py [utf8] (original)
+++ erp5/trunk/products/ERP5/mixin/property_recordable.py [utf8] Fri Nov 27 17:14:22 2009
@@ -60,10 +60,21 @@
 
     id -- ID of the property
     """
+    try:
+      property_info = [x for x in self.getPropertyMap() \
+                       if x['id'] == id][0]
+    except IndexError:
+      if id in self.getBaseCategoryList():
+        value = self.getPropertyList(id)
+      else: # should be local property
+        value = self.getProperty(id)
+    else:
+      if x['type'] in list_types:
+        value = self.getPropertyList(id)
+      else:
+        value = self.getProperty(id)
     recorded_property_dict = self._getRecordedPropertyDict()
-    # XXX it is better to use getPropertyList only for list type
-    # properties or categories.
-    recorded_property_dict[id] = self.getPropertyList(id)
+    recorded_property_dict[id] = value
 
   security.declareProtected(Permissions.ModifyPortalContent,
                             'clearRecordedProperty')