reorder apps, so templates of django's "admin" get considered last (so nsupdate or django registration can override them)

This commit is contained in:
Thomas Waldmann 2013-12-22 02:58:25 +01:00
parent b317837f58
commit bbe7ae096a
2 changed files with 7 additions and 1 deletions

View File

@ -147,7 +147,6 @@ INSTALLED_APPS = (
'django.contrib.sites',
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.admin',
'social.apps.django_app.default',
'south',
'nsupdate',
@ -156,6 +155,7 @@ INSTALLED_APPS = (
'nsupdate.main',
'bootstrapform',
'registration',
'django.contrib.admin',
'django_extensions',
)

View File

@ -64,6 +64,12 @@ urlpatterns = patterns(
'template_name': 'registration/password_change.html', # own template
'post_change_redirect': '/account/profile'}, # reverse() does not work here
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')),
# registration end
url(r'^account/', include('nsupdate.accounts.urls')),