Simple app to add configuration options to a Django project.
Merge branch 'master' into develop
+17
-4
+6
-1
HISTORY.rst
+6
-1
HISTORY.rst
+1
-1
options/__init__.py
+1
-1
options/__init__.py
+4
-1
options/helpers.py
+4
-1
options/helpers.py
···
9
9
from django.utils.text import slugify
10
10
11
11
from options.constants import INT, FLOAT, STRING, CONVERTER
12
-
from options.settings import DEFAULT_OPTION_MODEL, DEFAULT_USER_OPTION_MODEL
13
12
14
13
15
14
def get_option_model():
16
15
"""Return the Notification model that is active in this project."""
16
+
from options.settings import DEFAULT_OPTION_MODEL
17
+
17
18
try:
18
19
return django_apps.get_model(DEFAULT_OPTION_MODEL, require_ready=False)
19
20
except ValueError:
···
29
30
30
31
def get_user_option_model():
31
32
"""Return the Notification model that is active in this project."""
33
+
from options.settings import DEFAULT_USER_OPTION_MODEL
34
+
32
35
try:
33
36
return django_apps.get_model(DEFAULT_USER_OPTION_MODEL, require_ready=False)
34
37
except ValueError:
+6
-1
tests/settings.py
+6
-1
tests/settings.py
···
30
30
"rest_framework.authentication.SessionAuthentication",
31
31
)
32
32
}
33
+
from options.constants import STRING
33
34
34
35
SIMPLE_OPTIONS_CONFIGURATION = {
35
-
"default_option": {"public_name": "Default Option", "type": 2, "value": "default"}
36
+
"default_option": {
37
+
"public_name": "Default Option",
38
+
"type": STRING,
39
+
"value": "default",
40
+
}
36
41
}
37
42
SIMPLE_OPTIONS_EXCLUDE_USER = ["secret_option"]