diff options
| author | root <root@viserion.(none)> | 2013-04-30 10:45:14 +0000 |
|---|---|---|
| committer | root <root@viserion.(none)> | 2013-04-30 10:45:14 +0000 |
| commit | 2470c7c36a92a5714a7b8d56a1bcab904f23f0d8 (patch) | |
| tree | 53e045e9f05bc0e0252dbf059def75d26f3710ae /example_project/settings.py | |
| parent | 4bb3177058d78646469947c2ed1be5edc055e8a1 (diff) | |
| parent | 6e1cff0a016a08d6a19ec8211029a2713538dd58 (diff) | |
| download | Ishtar-2470c7c36a92a5714a7b8d56a1bcab904f23f0d8.tar.bz2 Ishtar-2470c7c36a92a5714a7b8d56a1bcab904f23f0d8.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'example_project/settings.py')
| -rw-r--r-- | example_project/settings.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index a9888375f..d856fcce5 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -102,6 +102,7 @@ INSTALLED_APPS = [ 'django.contrib.formtools', 'south', 'registration', + 'geodjangofla', 'ishtar_common', 'archaeological_operations', # mandatory app to run ishtar #'django_extensions', @@ -159,6 +160,10 @@ ISHTAR_OPE_COL_FORMAT = None ISHTAR_OPE_TYPES = {} # DB key: txt_idx ISHTAR_PERIODS = {} +ISHTAR_PERMIT_TYPES = {} +ISHTAR_DOC_TYPES = {} + +ISHTAR_DPTS = [] EXTRA_APPS = [] @@ -187,3 +192,7 @@ DEBUG_TOOLBAR_PANELS = ( ) DEBUG_TOOLBAR_CONFIG = {'INTERCEPT_REDIRECTS':False} + +import sys +if 'test' in sys.argv or 'test_coverage' in sys.argv: + DATABASES['default']['engine'] = 'sqlite3' |