From d0141cb0d13fc48f594b60abf52d71e1b0b0f3a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Wed, 7 Apr 2010 16:33:39 +0000 Subject: [PATCH] Search with relative_urls like project_module/1/% instead of project_module/1% (which was also matching project_module/10 by mistake) git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34332 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_project/Project_getMonthlyReportSectionList.xml | 2 +- .../portal_skins/erp5_project/Project_getRelatedBugList.xml | 2 +- .../erp5_project/Project_getSourceProjectRelatedTaskList.xml | 2 +- .../Project_getSourceProjectRelatedTaskReportList.xml | 2 +- bt5/erp5_project/bt/revision | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml index cffaaecada..8c4129813f 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getMonthlyReportSectionList.xml @@ -65,7 +65,7 @@ worker_column_list = []\n \n # find all Tasks\n source_project_uid_list = [x.uid for x in context.portal_catalog(\n - relative_url=\'%s%%\' % context.getRelativeUrl())]\n + relative_url=\'%s/%%\' % context.getRelativeUrl())]\n \n from_date = request.get(\'from_date\', None)\n if from_date is None:\n diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getRelatedBugList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getRelatedBugList.xml index aa08e4f2f8..31da89bd4e 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getRelatedBugList.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getRelatedBugList.xml @@ -54,7 +54,7 @@ <item> <key> <string>_body</string> </key> <value> <string>project_uid_list = [x.uid for x in context.portal_catalog(\n - relative_url=\'%s%%\' % context.getRelativeUrl())]\n + relative_url=\'%s/%%\' % context.getRelativeUrl())]\n \n return context.portal_catalog(selection=selection, \n selection_report=selection_report,\n diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml index e6530028d9..0c7f0a0009 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskList.xml @@ -56,7 +56,7 @@ <value> <string encoding="cdata"><![CDATA[ source_project_uid_list = [x.uid for x in context.portal_catalog(\n - relative_url=\'%s%%\' % context.getRelativeUrl())]\n + relative_url=\'%s/%%\' % context.getRelativeUrl())]\n \n from Products.ZSQLCatalog.SQLCatalog import Query\n \n diff --git a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskReportList.xml b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskReportList.xml index 7df4789b4d..d149f42e53 100644 --- a/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskReportList.xml +++ b/bt5/erp5_project/SkinTemplateItem/portal_skins/erp5_project/Project_getSourceProjectRelatedTaskReportList.xml @@ -56,7 +56,7 @@ <value> <string encoding="cdata"><![CDATA[ source_project_uid_list = [x.uid for x in context.portal_catalog(\n - relative_url=\'%s%%\' % context.getRelativeUrl())]\n + relative_url=\'%s/%%\' % context.getRelativeUrl())]\n \n from Products.ZSQLCatalog.SQLCatalog import Query\n \n diff --git a/bt5/erp5_project/bt/revision b/bt5/erp5_project/bt/revision index 5d1d1b123b..880ae56552 100644 --- a/bt5/erp5_project/bt/revision +++ b/bt5/erp5_project/bt/revision @@ -1 +1 @@ -755 \ No newline at end of file +756 \ No newline at end of file -- 2.30.9