[Erp5-report] r8995 - /erp5/trunk/products/ERP5/Tool/TemplateTool.py

[nobody at svn.erp5.org]

Author: chris
Date: Wed Aug  2 17:06:29 2006
New Revision: 8995

URL: http://svn.erp5.org?rev=8995&view=rev
Log:
- Fixed diff in multi installation dialog

Modified:
    erp5/trunk/products/ERP5/Tool/TemplateTool.py

Modified: erp5/trunk/products/ERP5/Tool/TemplateTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/TemplateTool.py?rev=8995&r1=8994&r2=8995&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/TemplateTool.py (original)
+++ erp5/trunk/products/ERP5/Tool/TemplateTool.py Wed Aug  2 17:06:29 2006
@@ -363,7 +363,6 @@
           os.remove(temppath)
       bt.build(no_action=1)
       bt.reindexObject()
-
       return bt
 
     def importFile(self, import_file=None, id=None, REQUEST=None, 
@@ -427,12 +426,19 @@
       """
       bt1_id = getattr(REQUEST, 'bt1', None)
       bt2_id = getattr(REQUEST, 'bt2', None)
-      bt1 = self._getOb(bt1_id)
-      bt2 = self._getOb(bt2_id)
-      if self.compareVersions(bt1.getVersion(), bt2.getVersion()) < 0:
-        return bt2.diffObject(REQUEST, compare_with=bt1_id)
+      if bt1_id is not None and bt2_id is not None:
+        bt1 = self._getOb(bt1_id)
+        bt2 = self._getOb(bt2_id)
+        if self.compareVersions(bt1.getVersion(), bt2.getVersion()) < 0:
+          return bt2.diffObject(REQUEST, compare_with=bt1_id)
+        else:
+          return bt1.diffObject(REQUEST, compare_with=bt2_id)
       else:
-        return bt1.diffObject(REQUEST, compare_with=bt2_id)
+        object_id = getattr(REQUEST, 'object_id', None)
+        bt1_id = object_id.split('|')[0]
+        bt1 = self._getOb(bt1_id)
+        REQUEST.set('object_id', object_id.split('|')[1])
+        return bt1.diffObject(REQUEST)
 
     security.declareProtected( 'Import/Export objects',
                                'updateRepositoryBusinessTemplateList' )