git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
823b721
)
django 1.7 compatibilitiy
author
Scott Baker
<smbaker@gmail.com>
Mon, 16 Jun 2014 20:58:21 +0000
(13:58 -0700)
committer
Scott Baker
<smbaker@gmail.com>
Mon, 16 Jun 2014 20:58:21 +0000
(13:58 -0700)
planetstack/planetstack/settings.py
patch
|
blob
|
history
diff --git
a/planetstack/planetstack/settings.py
b/planetstack/planetstack/settings.py
index
1f01e96
..
8c5ff75
100644
(file)
--- a/
planetstack/planetstack/settings.py
+++ b/
planetstack/planetstack/settings.py
@@
-1,4
+1,5
@@
from django.conf.global_settings import TEMPLATE_CONTEXT_PROCESSORS as TCP
from django.conf.global_settings import TEMPLATE_CONTEXT_PROCESSORS as TCP
+from django import VERSION as DJANGO_VERSION
# Django settings for planetstack project.
from config import Config
# Django settings for planetstack project.
from config import Config
@@
-122,7
+123,7
@@
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
- "/opt/planetstack/templates"
+ "/opt/planetstack/templates"
,
)
INSTALLED_APPS = (
)
INSTALLED_APPS = (
@@
-150,6
+151,12
@@
INSTALLED_APPS = (
'geoposition',
)
'geoposition',
)
+if DJANGO_VERSION[1]>=7:
+ # if django >= 1.7, then remove evolution and change the admin module
+ INSTALLED_APPS = list(INSTALLED_APPS)
+ INSTALLED_APPS[INSTALLED_APPS.index('django.contrib.admin')] = 'django.contrib.admin.apps.SimpleAdminConfig'
+ INSTALLED_APPS.remove('django_evolution')
+ INSTALLED_APPS = tuple(INSTALLED_APPS)
# Added for django-suit form
TEMPLATE_CONTEXT_PROCESSORS = TCP + (
# Added for django-suit form
TEMPLATE_CONTEXT_PROCESSORS = TCP + (