diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-19 18:33:16 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-04-19 18:33:16 +0200 |
| commit | eb471a13710be88ca249f30a68bd056aa8c5a292 (patch) | |
| tree | f2596427b81ad0df9e3a0b1b97201372b9fcc9cc /example_project/settings.py | |
| parent | 983662e505adca020492e0672968a19c0abb6ec2 (diff) | |
| parent | fc1c422e6c5e0c57ddb6209b609b2335f9cb4dde (diff) | |
| download | Ishtar-eb471a13710be88ca249f30a68bd056aa8c5a292.tar.bz2 Ishtar-eb471a13710be88ca249f30a68bd056aa8c5a292.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'example_project/settings.py')
| -rw-r--r-- | example_project/settings.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index 88738b479..8136fb81f 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -9,6 +9,7 @@ DEBUG = False DEBUG_TOOLBAR = False TEMPLATE_DEBUG = DEBUG SQL_DEBUG = False +DJANGO_EXTENSIONS = False if "test" in sys.argv: sys.path.insert(0, '..') @@ -138,7 +139,6 @@ INSTALLED_APPS = [ 'archaeological_context_records', 'archaeological_warehouse', 'archaeological_finds', - # 'django_extensions', # 'debug_toolbar', ] @@ -235,6 +235,8 @@ INTERNAL_IPS = ('127.0.0.1',) JQUERY_URL = STATIC_URL + "js/jquery.min.js" JQUERY_UI_URL = STATIC_URL + "js/jquery-ui/" +if DJANGO_EXTENSIONS: + INSTALLED_APPS.append('django_extensions') if DEBUG_TOOLBAR: if '..' not in sys.path: |