diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2016-01-10 15:35:51 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2016-01-10 15:35:51 +0100 |
| commit | 11d7e76203e13a6d4c2a0c9aa29bd2d1dd86f5b6 (patch) | |
| tree | 8d8e7c09faf179b2fed07878d1cf450a245a78d0 /example_project/settings.py | |
| parent | 19fcd922361b045894c0eeb56e095d785299909e (diff) | |
| parent | 2c063aace94e5a9f3b5dc596e4a502ef062db059 (diff) | |
| download | Ishtar-11d7e76203e13a6d4c2a0c9aa29bd2d1dd86f5b6.tar.bz2 Ishtar-11d7e76203e13a6d4c2a0c9aa29bd2d1dd86f5b6.zip | |
Merge branch 'master' into master-land-planner-2999
Diffstat (limited to 'example_project/settings.py')
| -rw-r--r-- | example_project/settings.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/example_project/settings.py b/example_project/settings.py index 6a0bf4079..e124198aa 100644 --- a/example_project/settings.py +++ b/example_project/settings.py @@ -10,6 +10,9 @@ DEBUG_TOOLBAR = False TEMPLATE_DEBUG = DEBUG SQL_DEBUG = False +if "test" in sys.argv: + sys.path.insert(0, '..') + IMAGE_MAX_SIZE = (1024, 768) THUMB_MAX_SIZE = (300, 300) @@ -17,13 +20,17 @@ CACHE_SMALLTIMEOUT = 120 CACHE_TIMEOUT = 3600 CACHE_BACKEND = 'memcached://127.0.0.1:11211/' -ROOT_PATH = os.path.abspath(os.path.curdir) + os.path.sep +SEP = os.path.sep +ROOT_PATH = SEP.join( + os.path.abspath(__file__).split(SEP)[:-1]) + SEP STATIC_URL = '/static/' STATIC_ROOT = ROOT_PATH + 'static/' BASE_URL = "/" - URL_PATH = "" +# prefix for archaeological files code +FILE_PREFIX = "SRA" + ODT_TEMPLATE = ROOT_PATH + "../ishtar_common/static/template.odt" LOGIN_REDIRECT_URL = "/" + URL_PATH |