From 9cc5a5b24d70e5dd7e69121882c197bc85d41586 Mon Sep 17 00:00:00 2001 From: Yoshinori Okuji <yo@nexedi.com> Date: Fri, 6 Nov 2009 10:34:39 +0000 Subject: [PATCH] Take it into account that alarm_date can be None. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@30359 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5/Tool/AlarmTool.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/product/ERP5/Tool/AlarmTool.py b/product/ERP5/Tool/AlarmTool.py index 494556da2d..0f32e90c98 100644 --- a/product/ERP5/Tool/AlarmTool.py +++ b/product/ERP5/Tool/AlarmTool.py @@ -122,8 +122,12 @@ class AlarmTool(BaseTool): alarm_date={'query':now,'range':'ngt'} ) # check again the alarm date in case the alarm was not yet reindexed - alarm_list = [x.getObject() for x in catalog_search \ - if x.getObject().getAlarmDate()<=now] + alarm_list = [] + for x in catalog_search: + alarm = x.getObject() + alarm_date = alarm.getAlarmDate() + if alarm_date is not None and alarm_date <= now: + alarm_list.append(alarm) else: catalog_search = self.portal_catalog.unrestrictedSearchResults( portal_type = self.getPortalAlarmTypeList() -- 2.30.9