[Erp5-report] r34169 kazuhiko - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Mar 26 22:17:55 CET 2010
Author: kazuhiko
Date: Fri Mar 26 22:17:54 2010
New Revision: 34169
URL: http://svn.erp5.org?rev=34169&view=rev
Log:
join only for list or tuple case, otherwise we can get wrong different of workflow chains.
Modified:
erp5/trunk/products/ERP5/Document/BusinessTemplate.py
Modified: erp5/trunk/products/ERP5/Document/BusinessTemplate.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/BusinessTemplate.py?rev=34169&r1=34168&r2=34169&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py [utf8] Fri Mar 26 22:17:54 2010
@@ -1984,8 +1984,10 @@
# compare object to see it there is changes
new_object = self._objects[path]
old_object = installed_item._objects[path]
- new_object = self._chain_string_separator.join(new_object)
- old_object = self._chain_string_separator.join(old_object)
+ if isinstance(new_object, list) or isinstance(new_object, tuple):
+ new_object = self._chain_string_separator.join(new_object)
+ if isinstance(old_object, list) or isinstance(old_object, tuple):
+ old_object = self._chain_string_separator.join(old_object)
if new_object != old_object:
modified_object_list.update({path : ['Modified', self.getTemplateTypeName()]})
else: # new object
More information about the Erp5-report
mailing list