thought i had it figured out why admin was stomping on accounts/password/change/ but I did not ... sigh
parent
c1e791882d
commit
04c87244a2
3
admin.py
3
admin.py
|
@ -56,8 +56,7 @@ admin_site = RegluitAdmin("Admin")
|
||||||
|
|
||||||
# need to figure out how to enable this without stomping on
|
# need to figure out how to enable this without stomping on
|
||||||
# /accounts/password/change/
|
# /accounts/password/change/
|
||||||
# admin_site.register(models.User, UserAdmin)
|
admin_site.register(models.User, UserAdmin)
|
||||||
|
|
||||||
admin_site.register(models.Work, WorkAdmin)
|
admin_site.register(models.Work, WorkAdmin)
|
||||||
admin_site.register(models.Claim, ClaimAdmin)
|
admin_site.register(models.Claim, ClaimAdmin)
|
||||||
admin_site.register(models.RightsHolder, RightsHolderAdmin)
|
admin_site.register(models.RightsHolder, RightsHolderAdmin)
|
||||||
|
|
|
@ -93,7 +93,7 @@ TEMPLATE_DIRS = (
|
||||||
|
|
||||||
INSTALLED_APPS = (
|
INSTALLED_APPS = (
|
||||||
'django.contrib.auth',
|
'django.contrib.auth',
|
||||||
'django.contrib.admin',
|
#'django.contrib.admin',
|
||||||
'django.contrib.contenttypes',
|
'django.contrib.contenttypes',
|
||||||
'django.contrib.sessions',
|
'django.contrib.sessions',
|
||||||
'django.contrib.sites',
|
'django.contrib.sites',
|
||||||
|
|
4
urls.py
4
urls.py
|
@ -1,7 +1,7 @@
|
||||||
from django.conf.urls.defaults import *
|
from django.conf.urls.defaults import *
|
||||||
from frontend.forms import ProfileForm
|
from frontend.forms import ProfileForm
|
||||||
|
|
||||||
from regluit.admin import admin_site
|
#from regluit.admin import admin_site
|
||||||
|
|
||||||
urlpatterns = patterns('',
|
urlpatterns = patterns('',
|
||||||
url(r'^accounts/activate/complete/$','django.contrib.auth.views.login',
|
url(r'^accounts/activate/complete/$','django.contrib.auth.views.login',
|
||||||
|
@ -15,5 +15,5 @@ urlpatterns = patterns('',
|
||||||
(r'', include('regluit.frontend.urls')),
|
(r'', include('regluit.frontend.urls')),
|
||||||
(r'', include('regluit.payment.urls')),
|
(r'', include('regluit.payment.urls')),
|
||||||
(r'^selectable/', include('selectable.urls')),
|
(r'^selectable/', include('selectable.urls')),
|
||||||
url(r'^admin/', include(admin_site.urls)),
|
# url(r'^admin/', include(admin_site.urls)),
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue