From: <sv...@ze...> - 2007-07-27 16:15:54
|
Author: jstevens Date: 2007-07-27 12:15:55 -0400 (Fri, 27 Jul 2007) New Revision: 6023 Modified: trunk/Products/ZenModel/UserSettings.py Log: fixes #1615 * alert rules for admin user now work Modified: trunk/Products/ZenModel/UserSettings.py =================================================================== --- trunk/Products/ZenModel/UserSettings.py 2007-07-26 21:56:34 UTC (rev 6022) +++ trunk/Products/ZenModel/UserSettings.py 2007-07-27 16:15:55 UTC (rev 6023) @@ -14,6 +14,7 @@ import types from random import choice +from copy import copy from Globals import DTMLFile from Globals import InitializeClass @@ -116,8 +117,9 @@ def getAllUserSettings(self): """Return list user settings objects. """ - return filter(lambda u: u.id != "admin", - self.objectValues(spec="UserSettings")) + # This code used to filter out the admin user. + # See ticket #1615 for why it no longer does. + return [o for o in self.objectValues(spec="UserSettings")] def getAllUserSettingsNames(self, filtNames=()): |