Commit 5efdf20e authored by Aurel's avatar Aurel

propagate parameters of getPreferredX until searchFolder


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14974 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 0d5fcce6
...@@ -126,7 +126,7 @@ class PreferenceMethod(Method) : ...@@ -126,7 +126,7 @@ class PreferenceMethod(Method) :
def _getPreference(user_name="") : def _getPreference(user_name="") :
found = 0 found = 0
MARKER = [] MARKER = []
for pref in instance._getSortedPreferenceList() : for pref in instance._getSortedPreferenceList(*args, **kw):
attr = getattr(pref, self._preference_name, MARKER) attr = getattr(pref, self._preference_name, MARKER)
if attr is not MARKER : if attr is not MARKER :
found = 1 found = 1
...@@ -184,7 +184,7 @@ class PreferenceTool(BaseTool): ...@@ -184,7 +184,7 @@ class PreferenceTool(BaseTool):
self.getActivePreference()._edit(**{pref_name:value}) self.getActivePreference()._edit(**{pref_name:value})
security.declarePrivate('_getSortedPreferenceList') security.declarePrivate('_getSortedPreferenceList')
def _getSortedPreferenceList(self) : def _getSortedPreferenceList(self, *args, **kw) :
""" return the most appropriate preferences objects, """ return the most appropriate preferences objects,
sorted so that the first in the list should be applied first sorted so that the first in the list should be applied first
""" """
...@@ -194,7 +194,7 @@ class PreferenceTool(BaseTool): ...@@ -194,7 +194,7 @@ class PreferenceTool(BaseTool):
# or better solution # or better solution
user = getToolByName(self, 'portal_membership').getAuthenticatedMember() user = getToolByName(self, 'portal_membership').getAuthenticatedMember()
user_is_manager = 'Manager' in user.getRolesInContext(self) user_is_manager = 'Manager' in user.getRolesInContext(self)
for pref in self.searchFolder(portal_type='Preference') : for pref in self.searchFolder(portal_type='Preference', *args, **kw) :
pref = pref.getObject() pref = pref.getObject()
if pref is not None and pref.getProperty('preference_state', if pref is not None and pref.getProperty('preference_state',
'broken') in ('enabled', 'global'): 'broken') in ('enabled', 'global'):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment