EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

thought i had it figured out why admin was stomping on accounts/password/change/ but I did not ... sigh

pull/1/head
Ed Summers 2011-11-19 12:34:38 -05:00
parent c1e791882d
commit 04c87244a2
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin.py
View File

@ -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)

2
settings/common.py
View File

@ -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
View File

@ -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)),
) )