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

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Mar  9 18:55:51 2009
New Revision: 25921

URL: http://svn.erp5.org?rev=25921&view=rev
Log:
provide informations of installed version and installed revision for each business template.

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=25921&r1=25920&r2=25921&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/TemplateTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Tool/TemplateTool.py [utf8] Mon Mar  9 18:55:51 2009
@@ -806,18 +806,26 @@
         del property_dict['id']
         version = property_dict['version']
         version_state = 'new'
-        for bt in self.searchFolder(title = property_dict['title']):
-          result = self.compareVersions(version, bt.getObject().getVersion())
+        installed_bt = \
+            self.getInstalledBusinessTemplate(property_dict['title'])
+        if installed_bt is not None:
+          installed_version = installed_bt.getVersion()
+          installed_revision = installed_bt.getRevision()
+          result = self.compareVersions(version, installed_version)
           if result == 0:
             version_state = 'present'
-            break
           elif result < 0:
             version_state = 'old'
+        else:
+          installed_version = ''
+          installed_revision = ''
         version_state_title = version_state_title_dict[version_state]
         uid = b64encode(cPickle.dumps((repository, id)))
         obj = newTempBusinessTemplate(self, 'temp_' + uid,
                                       version_state = version_state,
                                       version_state_title = version_state_title,
+                                      installed_version = installed_version,
+                                      installed_revision = installed_revision,
                                       repository = repository, **property_dict)
         obj.setUid(uid)
         template_list.append(obj)