[Erp5-report] r21114 - /erp5/trunk/products/ERP5Form/PreferenceTool.py

[nobody at svn.erp5.org]

Author: aurel
Date: Mon May 26 10:17:14 2008
New Revision: 21114

URL: http://svn.erp5.org?rev=21114&view=rev
Log:
make getSortedPreference also returned System Preference besides Preference

Modified:
    erp5/trunk/products/ERP5Form/PreferenceTool.py

Modified: erp5/trunk/products/ERP5Form/PreferenceTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/PreferenceTool.py?rev=21114&r1=21113&r2=21114&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/PreferenceTool.py (original)
+++ erp5/trunk/products/ERP5Form/PreferenceTool.py Mon May 26 10:17:14 2008
@@ -207,7 +207,6 @@
     """ set the preference on the active Preference object"""
     self.getActivePreference()._edit(**{pref_name:value})
 
-  security.declarePrivate('_getSortedPreferenceList')
   def _getSortedPreferenceList(self, *args, **kw) :
     """ return the most appropriate preferences objects,
         sorted so that the first in the list should be applied first
@@ -230,7 +229,10 @@
         else :
           prefs.append(pref)
     prefs.sort(lambda b, a: cmp(a.getPriority(), b.getPriority()))
-    return prefs
+    # 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
 
   security.declareProtected(Permissions.View, 'getActivePreference')
   def getActivePreference(self) :