From 9c7ec06f06a120a2355975c9e8db5aa279d2842f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Calonne?= <aurel@nexedi.com> Date: Mon, 26 May 2008 14:12:53 +0000 Subject: [PATCH] System Preferences must outranks Preferences git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21127 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5Form/PreferenceTool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product/ERP5Form/PreferenceTool.py b/product/ERP5Form/PreferenceTool.py index 47e210acbc..0d9d0db84d 100644 --- a/product/ERP5Form/PreferenceTool.py +++ b/product/ERP5Form/PreferenceTool.py @@ -232,7 +232,7 @@ class PreferenceTool(BaseTool): # add system preferences after user preferences sys_prefs = [x.getObject() for x in self.searchFolder(portal_type='System Preference', **kw)] sys_prefs.sort(lambda b, a: cmp(a.getPriority(), b.getPriority())) - return prefs + sys_prefs + return sys_prefs + prefs security.declareProtected(Permissions.View, 'getActivePreference') def getActivePreference(self) : -- 2.30.9