From b00e2f797c650e230e4bcc912e6987c15e66ecb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Thu, 10 Jun 2010 09:16:52 +0000 Subject: [PATCH] fix sql expression used in report (see bugs #1820 and #1824) git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36203 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../Person_getPersonDetailedContributionList.xml | 4 ++-- .../Person_statPersonDetailedContributionList.xml | 8 +++++--- bt5/erp5_base/bt/revision | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml index be9561e454..1e485b78fd 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_getPersonDetailedContributionList.xml @@ -97,8 +97,8 @@ elif from_date is not None:\n elif to_date is not None:\n params = {"creation_date":to_date}\n query = Query(range="max", **params)\n -select_expression = \'DATE_FORMAT(creation_date, "%s") as date, portal_type\' %sql_format\n -group_by = \'DATE_FORMAT(creation_date, "%s"), portal_type\' %sql_format\n +select_expression = {\'date\' : \'DATE_FORMAT(creation_date, "%s")\'%sql_format, \'portal_type\' : None}\n +group_by = [\'DATE_FORMAT(creation_date, "%s")\' % sql_format, \'portal_type\']\n \n # count number of object created by the user for each type of document\n reference = kw.get(\'person_reference_list\', context.getReference())\n diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_statPersonDetailedContributionList.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_statPersonDetailedContributionList.xml index f96c34c47a..f704efb9f5 100644 --- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_statPersonDetailedContributionList.xml +++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Person_statPersonDetailedContributionList.xml @@ -61,7 +61,6 @@ stat_line = request.get(\'stat_line\', None)\n return stat_line\n \n \n -\n # XXX example of another way to get the stat line but this is slower\n from Products.ERP5Type.Log import log\n from Products.PythonScripts.standard import Object\n @@ -98,8 +97,9 @@ elif from_date is not None:\n elif to_date is not None:\n params = {"creation_date":to_date}\n query = Query(range="ngt", **params)\n -select_expression_list = \'DATE_FORMAT(creation_date, "%s") as date\' %sql_format\n -group_by_list = \'DATE_FORMAT(creation_date, "%s")\' %sql_format\n +select_expression = {\'date\' : \'DATE_FORMAT(creation_date, "%s")\'%sql_format}\n +group_by = [\'DATE_FORMAT(creation_date, "%s")\' % sql_format,]\n +\n # count number of object created by the user for each type of document\n result_list = context.portal_catalog.countResults(select_expression=select_expression_list,\n portal_type=portal_type_list,limit=None,\n @@ -191,6 +191,8 @@ return [obj,]\n <string>params</string> <string>query</string> <string>_apply_</string> + <string>select_expression</string> + <string>group_by</string> <string>select_expression_list</string> <string>group_by_list</string> <string>result_list</string> diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision index 126adfec91..eb6fa5affc 100644 --- a/bt5/erp5_base/bt/revision +++ b/bt5/erp5_base/bt/revision @@ -1 +1 @@ -772 \ No newline at end of file +773 \ No newline at end of file -- 2.30.9