From e3f547f2f5f4943b8452201c132cff94d25dc7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Thu, 31 May 2012 13:40:20 +0000 Subject: [PATCH] Fixup date passing. --- .../portal_skins/vifib_slap/Alarm_updatePersonOpenOrder.xml | 4 ++-- .../portal_skins/vifib_slap/Person_storeOpenOrderJournal.xml | 4 ++-- master/bt5/vifib_slap/bt/revision | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_updatePersonOpenOrder.xml b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_updatePersonOpenOrder.xml index 1f3723930c..657b8c030c 100644 --- a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_updatePersonOpenOrder.xml +++ b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_updatePersonOpenOrder.xml @@ -56,12 +56,12 @@ kw = {}\n search_kw = {}\n from DateTime import DateTime\n from Products.ZSQLCatalog.SQLCatalog import Query\n -from Products.ERP5Type.DateUtils import getClosestDate, addToDate\n +from Products.ERP5Type.DateUtils import addToDate\n \n last_active_process = context.getLastActiveProcess()\n if last_active_process is not None and not(params.get(\'full\', False)):\n # fetch only objects modified since last alarm run\n - kw[\'modification_date\'] = Query(modification_date=last_active_process.getStartDate(), range="min")\n + kw[\'modification_date\'] = last_active_process.getStartDate()\n search_kw[\'modification_date\'] = Query(modification_date=addToDate(last_active_process.getStartDate(), to_add={\'hour\': -1}), range="min")\n # register active process in order to have "windows" of last indexed objects\n context.newActiveProcess()\n diff --git a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_storeOpenOrderJournal.xml b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_storeOpenOrderJournal.xml index 4221ac4937..77a179744a 100644 --- a/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_storeOpenOrderJournal.xml +++ b/master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_storeOpenOrderJournal.xml @@ -51,12 +51,12 @@ <item> <key> <string>_body</string> </key> <value> <string>from Products.ZSQLCatalog.SQLCatalog import Query\n +from Products.ERP5Type.DateUtils import addToDate\n portal = context.getPortalObject()\n \n kw = {}\n if modification_date is not None:\n - kw[\'modification_date\'] = Query(modification_date=modification_date, range="min")\n -\n + kw[\'modification_date\'] = Query(modification_date=addToDate(modification_date, to_add={\'hour\': -1}), range="min")\n remove_hosting_list = []\n add_kw_list = []\n start_date_tuple_list = []\n diff --git a/master/bt5/vifib_slap/bt/revision b/master/bt5/vifib_slap/bt/revision index 880ae56552..d7a801b1e0 100644 --- a/master/bt5/vifib_slap/bt/revision +++ b/master/bt5/vifib_slap/bt/revision @@ -1 +1 @@ -756 \ No newline at end of file +757 \ No newline at end of file -- 2.30.9