[Erp5-report] r13735 - /erp5/trunk/products/ERP5/Tool/AlarmTool.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Mar 28 10:25:02 CEST 2007
Author: jerome
Date: Wed Mar 28 10:25:01 2007
New Revision: 13735
URL: http://svn.erp5.org?rev=13735&view=rev
Log:
use unrestrictedSearchResults instead of changing the security manager.
do not use 'if obj'
Modified:
erp5/trunk/products/ERP5/Tool/AlarmTool.py
Modified: erp5/trunk/products/ERP5/Tool/AlarmTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Tool/AlarmTool.py?rev=13735&r1=13734&r2=13735&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Tool/AlarmTool.py (original)
+++ erp5/trunk/products/ERP5/Tool/AlarmTool.py Wed Mar 28 10:25:01 2007
@@ -106,19 +106,17 @@
"""
We retrieve thanks to the catalog the full list of alarms
"""
- user = self.portal_catalog.getOwner()
- newSecurityManager(self.REQUEST, user)
if to_active:
now = DateTime()
- catalog_search = self.portal_catalog(
- portal_type = self.getPortalAlarmTypeList(),
+ catalog_search = self.portal_catalog.unrestrictedSearchResults(
+ portal_type = self.getPortalAlarmTypeList(),
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]
else:
- catalog_search = self.portal_catalog(
+ catalog_search = self.portal_catalog.unrestrictedSearchResults(
portal_type = self.getPortalAlarmTypeList()
)
alarm_list = [x.getObject() for x in catalog_search]
@@ -132,7 +130,7 @@
"""
current_date = DateTime()
for alarm in self.getAlarmList(to_active=1):
- if alarm:
+ if alarm is not None:
user = alarm.getOwner()
newSecurityManager(self.REQUEST, user)
if alarm.isActive() or not alarm.isEnabled():
More information about the Erp5-report
mailing list