From f389a5ca586859685c63b7f01ba2eadb736942f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Puente-Sarr=C3=ADn?= Date: Sat, 27 Oct 2018 00:14:59 -0500 Subject: [PATCH 1/2] Make cleanup on default settings. --- oauthadmin/settings.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/oauthadmin/settings.py b/oauthadmin/settings.py index 9e291af..3f7c4ca 100644 --- a/oauthadmin/settings.py +++ b/oauthadmin/settings.py @@ -1,13 +1,17 @@ -from django.conf import settings as global_settings +from django.conf import settings as django_settings -defaults = { - # default values for all django-oauth2-admin settings - "GET_USER": 'oauthadmin.stubs.get_user', - "PING_INTERVAL": 300, - "OAUTHADMIN_DEFAULT_NEXT_URL": "/admin/", +# Default values for all django-oauth2-admin settings +DEFAULT_SETTINGS = { + 'GET_USER': 'oauthadmin.stubs.get_user', + 'PING_INTERVAL': 300, + 'OAUTHADMIN_DEFAULT_NEXT_URL': '/admin/', } +OAUTHADMIN_SETTINGS_PREFIX = 'OAUTHADMIN_' -global_prefix = 'OAUTHADMIN_' def app_setting(name): - return getattr(global_settings, global_prefix+name, defaults.get(name)) + return getattr( + django_settings, + '{}{}'.format(OAUTHADMIN_SETTINGS_PREFIX, name), + DEFAULT_SETTINGS.get(name) + ) From f81cff92f3ccc0dcfe1e031e8e16339ba39ea7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Puente-Sarr=C3=ADn?= Date: Sat, 27 Oct 2018 00:16:14 -0500 Subject: [PATCH 2/2] Fix default setting name for DEFAULT_NEXT_URL since prefix is used in app_setting function. --- oauthadmin/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oauthadmin/settings.py b/oauthadmin/settings.py index 3f7c4ca..ccfbbb3 100644 --- a/oauthadmin/settings.py +++ b/oauthadmin/settings.py @@ -4,7 +4,7 @@ DEFAULT_SETTINGS = { 'GET_USER': 'oauthadmin.stubs.get_user', 'PING_INTERVAL': 300, - 'OAUTHADMIN_DEFAULT_NEXT_URL': '/admin/', + 'DEFAULT_NEXT_URL': '/admin/', } OAUTHADMIN_SETTINGS_PREFIX = 'OAUTHADMIN_'