[Erp5-report] r19469 - /erp5/trunk/products/ERP5/Document/BusinessTemplate.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Feb 22 18:23:09 CET 2008
Author: nicolas
Date: Fri Feb 22 18:23:08 2008
New Revision: 19469
URL: http://svn.erp5.org?rev=19469&view=rev
Log:
Use Constant instead repeat same string
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=19469&r1=19468&r2=19469&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/BusinessTemplate.py (original)
+++ erp5/trunk/products/ERP5/Document/BusinessTemplate.py Fri Feb 22 18:23:08 2008
@@ -87,6 +87,8 @@
catalog_method_filter_list = ('_filter_expression_archive',
'_filter_expression_instance_archive',
'_filter_type_archive',)
+
+INSTALLED_BT_FOR_DIFF = 'installed_bt_for_diff'
def _getCatalog(acquisition_context):
"""
@@ -2851,7 +2853,7 @@
modified_object_list = {}
if context.getTemplateFormatVersion() == 1:
new_roles = self._objects.keys()
- if installed_bt.id == 'installed_bt_for_diff':
+ if installed_bt.id == INSTALLED_BT_FOR_DIFF:
#must rename keys in dict if reinstall
new_dict = PersistentMapping()
old_keys = ()
@@ -4627,7 +4629,7 @@
reinstall = 0
if installed_bt == self:
reinstall = 1
- bt2 = self.portal_templates.manage_clone(ob=installed_bt, id='installed_bt_for_diff')
+ bt2 = self.portal_templates.manage_clone(ob=installed_bt, id=INSTALLED_BT_FOR_DIFF)
# update portal types properties to get last modifications
bt2.getPortalTypesProperties()
bt2.edit(description='tmp bt generated for diff')
@@ -4660,7 +4662,7 @@
modified_object_list.update({path : ['New', new_item.__class__.__name__[:-12]]})
if reinstall:
- self.portal_templates.manage_delObjects(ids=['installed_bt_for_diff'])
+ self.portal_templates.manage_delObjects(ids=[INSTALLED_BT_FOR_DIFF])
return modified_object_list
@@ -5282,7 +5284,7 @@
if installed_bt == new_bt:
compare_to_zodb = 1
if compare_to_zodb:
- bt2 = self.portal_templates.manage_clone(ob=installed_bt, id='installed_bt_for_diff')
+ bt2 = self.portal_templates.manage_clone(ob=installed_bt, id=INSTALLED_BT_FOR_DIFF)
# Update portal types properties to get last modifications
bt2.getPortalTypesProperties()
bt2.edit(description='tmp bt generated for diff')
@@ -5387,7 +5389,7 @@
diff_msg += 'Unsupported file !'
if compare_to_zodb:
- self.portal_templates.manage_delObjects(ids=['installed_bt_for_diff'])
+ self.portal_templates.manage_delObjects(ids=[INSTALLED_BT_FOR_DIFF])
return diff_msg
More information about the Erp5-report
mailing list