From 04c87244a2ef5b7c66a9e0a914febbc09c53d3cd Mon Sep 17 00:00:00 2001
From: Ed Summers <ehs@pobox.com>
Date: Sat, 19 Nov 2011 12:34:38 -0500
Subject: [PATCH] thought i had it figured out why admin was stomping on
 accounts/password/change/ but I did not ... sigh

---
 admin.py           | 3 +--
 settings/common.py | 2 +-
 urls.py            | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/admin.py b/admin.py
index cd0037d6..d873aee0 100644
--- a/admin.py
+++ b/admin.py
@@ -56,8 +56,7 @@ admin_site = RegluitAdmin("Admin")
 
 # need to figure out how to enable this without stomping on 
 # /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.Claim, ClaimAdmin)
 admin_site.register(models.RightsHolder, RightsHolderAdmin)
diff --git a/settings/common.py b/settings/common.py
index e77324bd..3c0daabf 100644
--- a/settings/common.py
+++ b/settings/common.py
@@ -93,7 +93,7 @@ TEMPLATE_DIRS = (
 
 INSTALLED_APPS = (
     'django.contrib.auth',
-    'django.contrib.admin',
+    #'django.contrib.admin',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.sites',
diff --git a/urls.py b/urls.py
index 33fb3061..fe5de91e 100755
--- a/urls.py
+++ b/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls.defaults import *
 from frontend.forms import ProfileForm
 
-from regluit.admin import admin_site
+#from regluit.admin import admin_site
 
 urlpatterns = patterns('',
     url(r'^accounts/activate/complete/$','django.contrib.auth.views.login',
@@ -15,5 +15,5 @@ urlpatterns = patterns('',
     (r'', include('regluit.frontend.urls')),
     (r'', include('regluit.payment.urls')),
     (r'^selectable/', include('selectable.urls')),
-    url(r'^admin/', include(admin_site.urls)), 
+#    url(r'^admin/', include(admin_site.urls)), 
 )