reorder apps, so templates of django's "admin" get considered last (so nsupdate or django registration can override them)
This commit is contained in:
parent
b317837f58
commit
bbe7ae096a
@ -147,7 +147,6 @@ INSTALLED_APPS = (
|
|||||||
'django.contrib.sites',
|
'django.contrib.sites',
|
||||||
'django.contrib.messages',
|
'django.contrib.messages',
|
||||||
'django.contrib.staticfiles',
|
'django.contrib.staticfiles',
|
||||||
'django.contrib.admin',
|
|
||||||
'social.apps.django_app.default',
|
'social.apps.django_app.default',
|
||||||
'south',
|
'south',
|
||||||
'nsupdate',
|
'nsupdate',
|
||||||
@ -156,6 +155,7 @@ INSTALLED_APPS = (
|
|||||||
'nsupdate.main',
|
'nsupdate.main',
|
||||||
'bootstrapform',
|
'bootstrapform',
|
||||||
'registration',
|
'registration',
|
||||||
|
'django.contrib.admin',
|
||||||
'django_extensions',
|
'django_extensions',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -64,6 +64,12 @@ urlpatterns = patterns(
|
|||||||
'template_name': 'registration/password_change.html', # own template
|
'template_name': 'registration/password_change.html', # own template
|
||||||
'post_change_redirect': '/account/profile'}, # reverse() does not work here
|
'post_change_redirect': '/account/profile'}, # reverse() does not work here
|
||||||
name='auth_password_change'),
|
name='auth_password_change'),
|
||||||
|
#url(r'^accounts/password/reset/$',
|
||||||
|
# auth_views.password_reset,
|
||||||
|
# name='auth_password_reset'),
|
||||||
|
#url(r'^accounts/password/reset/done/$',
|
||||||
|
# auth_views.password_reset,
|
||||||
|
# name='password_reset_done'),
|
||||||
url(r'^accounts/', include('registration.backends.default.urls')),
|
url(r'^accounts/', include('registration.backends.default.urls')),
|
||||||
# registration end
|
# registration end
|
||||||
url(r'^account/', include('nsupdate.accounts.urls')),
|
url(r'^account/', include('nsupdate.accounts.urls')),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user