projects
/
htsworkflow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Admin compatibility for changes in Django >= 1.1.
[htsworkflow.git]
/
htsworkflow
/
frontend
/
urls.py
diff --git
a/htsworkflow/frontend/urls.py
b/htsworkflow/frontend/urls.py
index abd8cd794665929895e32f6c472ff7c859830edb..73a0a14f54c9f3193a6862bf019fbba4683760fb 100644
(file)
--- a/
htsworkflow/frontend/urls.py
+++ b/
htsworkflow/frontend/urls.py
@@
-1,5
+1,6
@@
from django.conf.urls.defaults import *
from django.contrib import admin
from django.conf.urls.defaults import *
from django.contrib import admin
+import django
admin.autodiscover()
# Databrowser:
admin.autodiscover()
# Databrowser:
@@
-10,6
+11,7
@@
admin.autodiscover()
from htsworkflow.frontend import settings
from htsworkflow.frontend import settings
+
urlpatterns = patterns('',
('^accounts/login/$', 'django.contrib.auth.views.login'),
('^accounts/logout/$', 'django.contrib.auth.views.logout'),
urlpatterns = patterns('',
('^accounts/login/$', 'django.contrib.auth.views.login'),
('^accounts/logout/$', 'django.contrib.auth.views.logout'),
@@
-19,8
+21,8
@@
urlpatterns = patterns('',
('^accounts/profile/$', 'htsworkflow.frontend.samples.views.user_profile'),
# Base:
(r'^eland_config/', include('htsworkflow.frontend.eland_config.urls')),
('^accounts/profile/$', 'htsworkflow.frontend.samples.views.user_profile'),
# Base:
(r'^eland_config/', include('htsworkflow.frontend.eland_config.urls')),
- #
Admin:
- (r'^admin/(.*)', admin.site.root),
+ #
## MOVED Admin from here ###
+
#
(r'^admin/(.*)', admin.site.root),
# Experiments:
(r'^experiments/', include('htsworkflow.frontend.experiments.urls')),
# AnalysTrack:
# Experiments:
(r'^experiments/', include('htsworkflow.frontend.experiments.urls')),
# AnalysTrack:
@@
-51,6
+53,16
@@
urlpatterns = patterns('',
#(r'^databrowse/(.*)', databrowse.site.root)
)
#(r'^databrowse/(.*)', databrowse.site.root)
)
+# Allow admin
+if django.VERSION >= (1, 1, 0, 'final', 0):
+ urlpatterns = patterns('',
+ (r'^admin/', include(admin.site.urls)),
+ )
+else:
+ urlpatterns = patterns('',
+ (r'^admin/(.*)', admin.site.root),
+ )
+
if settings.DEBUG:
urlpatterns += patterns('',
(r'^static/(?P<path>.*)$', 'django.views.static.serve',
if settings.DEBUG:
urlpatterns += patterns('',
(r'^static/(?P<path>.*)$', 'django.views.static.serve',