From 92b47386e37583d56c71d7109c75325322fd530e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Mon, 5 Sep 2011 09:31:51 +0200 Subject: [PATCH] fix dependency handling with provision bt5 in selection As repository can be either bt5 either folder, we must check for both type of id --- .../TemplateTool_installRepositoryBusinessTemplateList.xml | 2 +- product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installRepositoryBusinessTemplateList.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installRepositoryBusinessTemplateList.xml index 564f192863..972b709670 100644 --- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installRepositoryBusinessTemplateList.xml +++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/TemplateTool_installRepositoryBusinessTemplateList.xml @@ -90,7 +90,7 @@ for uid in uids:\n provider_list = context.getProviderList(dep_id)\n provider_installed = False\n for provider in provider_list:\n - if provider+\'.bt5\' in id_list:\n + if provider+\'.bt5\' in id_list or provider in id_list:\n provider_installed = True\n break\n if not provider_installed:\n diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index 8527a8f2ff..a35bbfe356 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -40976 \ No newline at end of file +40977 \ No newline at end of file -- 2.30.9