Skip to content

E
edx-platform
Commit 55270802 by ichuang
Options

the admin page should be loaded based on settings.DEBUG, not askbot

parent 8e7db1c5
Showing with 4 additions and 3 deletions
lms/urls.py
...@@ -197,7 +197,6 @@ if settings.QUICKEDIT: ...@@ -197,7 +197,6 @@ if settings.QUICKEDIT:
if settings.ASKBOT_ENABLED: if settings.ASKBOT_ENABLED:
urlpatterns += (url(r'^%s' % settings.ASKBOT_URL, include('askbot.urls')), \ urlpatterns += (url(r'^%s' % settings.ASKBOT_URL, include('askbot.urls')), \
url(r'^admin/', include(admin.site.urls)), \
url(r'^settings/', include('askbot.deps.livesettings.urls')), \ url(r'^settings/', include('askbot.deps.livesettings.urls')), \
url(r'^followit/', include('followit.urls')), \ url(r'^followit/', include('followit.urls')), \
# url(r'^robots.txt$', include('robots.urls')), # url(r'^robots.txt$', include('robots.urls')),
...@@ -206,8 +205,10 @@ if settings.ASKBOT_ENABLED: ...@@ -206,8 +205,10 @@ if settings.ASKBOT_ENABLED:
if settings.DEBUG: if settings.DEBUG:
## Jasmine ## Jasmine and admin
urlpatterns=urlpatterns + (url(r'^_jasmine/', include('django_jasmine.urls')),) urlpatterns=urlpatterns + (url(r'^_jasmine/', include('django_jasmine.urls')),
url(r'^admin/', include(admin.site.urls)),
)
if settings.MITX_FEATURES.get('AUTH_USE_OPENID'): if settings.MITX_FEATURES.get('AUTH_USE_OPENID'):
urlpatterns += ( urlpatterns += (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment