entrouvert
/
authentic
16
0
Fork 0
Code Issues Pull Requests 32 Releases Activity

utils: reshuffle user flag retrieval precedence (#46650)

This commit is contained in:
Paul Marillonnet 2021-06-22 15:33:17 +02:00
parent 7f67ec30ca
commit dc26670153
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/authentic2/utils/__init__.py
View File

@ -1224,10 +1224,6 @@ def get_user_flag(user, name, default=None):
'''Get a boolean flag settable at user, by a hook, globally or ou wide'''
from .. import hooks
setting_value = getattr(app_settings, 'A2_USER_' + name.upper(), None)
if setting_value is not None:
return bool(setting_value)
user_value = getattr(user, name, None)
if user_value is not None:
return user_value
@ -1240,6 +1236,11 @@ def get_user_flag(user, name, default=None):
ou_value = getattr(user.ou, 'user_' + name, None)
if ou_value is not None:
return ou_value
setting_value = getattr(app_settings, 'A2_USER_' + name.upper(), None)
if setting_value is not None:
return bool(setting_value)
return default