mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-27 07:02:26 +00:00
Fix login screen not being redirected
This commit is contained in:
parent
831e0c0690
commit
e900ce0d0d
1 changed files with 4 additions and 3 deletions
|
@ -62,9 +62,7 @@ urlpatterns = [
|
||||||
url(r'^$', index, name='index'),
|
url(r'^$', index, name='index'),
|
||||||
url(r'^about/$', about_page, name='about'),
|
url(r'^about/$', about_page, name='about'),
|
||||||
url(r'^contact/$', contact_page, name='contact'),
|
url(r'^contact/$', contact_page, name='contact'),
|
||||||
url('^', include('django.contrib.auth.urls')),
|
|
||||||
url(r'^i18n/', include('django.conf.urls.i18n')),
|
url(r'^i18n/', include('django.conf.urls.i18n')),
|
||||||
url(r'^admin/', include(admin.site.urls)),
|
|
||||||
url(r'^users/', include('users.urls', namespace='users')),
|
url(r'^users/', include('users.urls', namespace='users')),
|
||||||
url(r'^search/', include('search.urls', namespace='search')),
|
url(r'^search/', include('search.urls', namespace='search')),
|
||||||
url(
|
url(
|
||||||
|
@ -79,8 +77,11 @@ urlpatterns = [
|
||||||
include('preferences.urls', namespace='preferences')
|
include('preferences.urls', namespace='preferences')
|
||||||
),
|
),
|
||||||
|
|
||||||
|
# Include contrib auth and contrib admin
|
||||||
# manage/login/ is redirected to the non-admin login page
|
# manage/login/ is redirected to the non-admin login page
|
||||||
url(r'^manage/login/$', RedirectView.as_view(pattern_name='login')),
|
url(r'^', include('django.contrib.auth.urls')),
|
||||||
|
url(r'^admin/login/$', RedirectView.as_view(pattern_name='login')),
|
||||||
|
url(r'^admin/', include(admin.site.urls)),
|
||||||
]
|
]
|
||||||
# Add debug_toolbar URLs if activated
|
# Add debug_toolbar URLs if activated
|
||||||
if 'debug_toolbar' in settings.INSTALLED_APPS:
|
if 'debug_toolbar' in settings.INSTALLED_APPS:
|
||||||
|
|
Loading…
Reference in a new issue