Projet

Général

Profil

0001-utils-reshuffle-user-flag-retrieval-precedence-46650.patch

Paul Marillonnet, 22 juin 2021 16:49

Télécharger (1,31 ko)

Voir les différences:

Subject: [PATCH 1/2] utils: reshuffle user flag retrieval precedence (#46650)

 src/authentic2/utils/__init__.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
src/authentic2/utils/__init__.py
1224 1224
    '''Get a boolean flag settable at user, by a hook, globally or ou wide'''
1225 1225
    from .. import hooks
1226 1226

  
1227
    setting_value = getattr(app_settings, 'A2_USER_' + name.upper(), None)
1228
    if setting_value is not None:
1229
        return bool(setting_value)
1230

  
1231 1227
    user_value = getattr(user, name, None)
1232 1228
    if user_value is not None:
1233 1229
        return user_value
......
1240 1236
        ou_value = getattr(user.ou, 'user_' + name, None)
1241 1237
        if ou_value is not None:
1242 1238
            return ou_value
1239

  
1240
    setting_value = getattr(app_settings, 'A2_USER_' + name.upper(), None)
1241
    if setting_value is not None:
1242
        return bool(setting_value)
1243

  
1243 1244
    return default
1244 1245

  
1245 1246

  
1246
-