diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-26 20:52:11 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-26 20:52:11 +0100 |
| commit | f72f7d90893b4f4ae0e000563b7c20faeefc8f18 (patch) | |
| tree | 8c8f06c9fb974edde62e82875f7a1b8aad49d7c3 /example_project/settings.py | |
| parent | 90b20a15bd6bf4f7808957bb8820f10f0d66d5e8 (diff) | |
| parent | 0cd8904defe334ad5307e6ab3ce13638479815a8 (diff) | |
| download | Ishtar-f72f7d90893b4f4ae0e000563b7c20faeefc8f18.tar.bz2 Ishtar-f72f7d90893b4f4ae0e000563b7c20faeefc8f18.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'example_project/settings.py')
| -rw-r--r-- | example_project/settings.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index e124198aa..98eb14e9e 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -104,6 +104,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( "django.core.context_processors.i18n", "django.core.context_processors.media", "django.core.context_processors.static", + "django.core.context_processors.request", ) ROOT_URLCONF = 'example_project.urls' @@ -125,11 +126,18 @@ INSTALLED_APPS = [ 'django.contrib.gis', 'django.contrib.staticfiles', 'django.contrib.formtools', + 'django.contrib.messages', 'south', 'registration', # 'geodjangofla', + 'ishtar_pdl', 'ishtar_common', - 'archaeological_operations', # mandatory app to run ishtar + 'archaeological_files_pdl', + 'archaeological_files', + 'archaeological_operations', + 'archaeological_context_records', + 'archaeological_warehouse', + 'archaeological_finds', # 'django_extensions', # 'debug_toolbar', ] @@ -214,16 +222,6 @@ except ImportError, e: if 'test' in sys.argv: SOUTH_TESTS_MIGRATE = False -for app in PRE_APPS: - INSTALLED_APPS.insert(INSTALLED_APPS.index('ishtar_common'), app) - -if 'archaeological_files' in EXTRA_APPS: - EXTRA_APPS.pop(EXTRA_APPS.index('archaeological_files')) - INSTALLED_APPS.insert(INSTALLED_APPS.index('archaeological_operations'), - 'archaeological_files') - -INSTALLED_APPS += EXTRA_APPS - PROJECT_SLUG = locals().get('PROJECT_SLUG', 'default') if LOGFILE: |