Fix TemplateTool.getDependencyList()

In particular, 'transactional_cached' decorator was a noop the way it was used.

This reapplies commit d806bdae,
along with a fix to test_resolveBusinessTemplateListDependency.

product/ERP5/Tool/TemplateTool.py

@@ -878,19 +878,15 @@ class TemplateTool (BaseTool):
 
     security.declareProtected(Permissions.AccessContentsInformation,
                                'getDependencyList')
+    @transactional_cached(lambda self, bt: bt)
     def getDependencyList(self, bt):
       """
        Return the list of missing dependencies for a business
        template, given a tuple : (repository, id)
       """
-      # use by using "self" on transactional_cached decorator
-      # breaks ERP5Site creation due aq_base.
-      @transactional_cached(lambda bt: (bt))
-      def _getDependency(bt):
-        # We do not take into consideration the dependencies
-        # for meta business templates
-        if bt[0] == 'meta':
-          return []
+      # We do not take into consideration the dependencies
+      # for meta business templates
+      if bt[0] != 'meta':
         result_list = []
         for repository, property_dict_list in self.repository_dict.items():
           if repository == bt[0]:
@@ -920,7 +916,7 @@ class TemplateTool (BaseTool):
                     except BusinessTemplateIsMeta:
                       provider_list = self.getProviderList(dependency)
                       for provider in provider_list:
-                        if self.portal_templates.getInstalledBusinessTemplate(provider) is not None:
+                        if self.getInstalledBusinessTemplate(provider) is not None:
                           bt_dep = self.getLastestBTOnRepos(provider)
                           break
                       if bt_dep is None:
@@ -932,8 +928,7 @@ class TemplateTool (BaseTool):
                     result_list.append(bt_dep)
                 return result_list
         raise BusinessTemplateUnknownError, 'The Business Template %s could not be found on repository %s'%(bt[1], bt[0])
-
-      return _getDependency(bt)
+      return []
 
     def findProviderInBTList(self, provider_list, bt_list):
       """

product/ERP5/tests/testTemplateTool.py

@@ -449,7 +449,7 @@ class TestTemplateTool(ERP5TypeTestCase):
     # By removing ca1, we remove the choice for the "sql" provider.
     # Therefore template tool does not know any more what to take for "sql".
     template_tool.manage_delObjects(['ca1'])
-
+    self.commit()
     self.assertRaises(BusinessTemplateMissingDependency,
                 template_tool.resolveBusinessTemplateListDependency,
                 bt5_id_list)