diff --git a/app/conf/common.py b/app/conf/common.py index a44d7dd..3d11112 100644 --- a/app/conf/common.py +++ b/app/conf/common.py @@ -63,7 +63,6 @@ INSTALLED_APPS = ( 'django.contrib.humanize', 'django.contrib.staticfiles', 'raven.contrib.django', - 'nexus', 'gargoyle', 'south', 'piston', @@ -80,10 +79,6 @@ INSTALLED_APPS = ( 'tools', ) -AUTHENTICATION_BACKENDS = ( - 'sso.backends.SimpleHashModelBackend', -) - AUTH_PROFILE_MODULE = 'sso.SSOUser' LOGIN_REDIRECT_URL = "/profile" LOGIN_URL = "/login" diff --git a/app/sso/backends.py b/app/sso/backends.py deleted file mode 100644 index 712d483..0000000 --- a/app/sso/backends.py +++ /dev/null @@ -1,26 +0,0 @@ -from django.contrib.auth.backends import ModelBackend -from django.contrib.auth.models import User -from hashlib import sha1 - - -class SimpleHashModelBackend(ModelBackend): - - supports_anonymous_user = False - supports_object_permissions = False - supports_inactive_user = False - - def authenticate(self, username=None, password=None): - try: - user = User.objects.get(username=username) - except User.DoesNotExist: - return None - - if '$' in user.password: - if user.check_password(password): - return user - else: - if user.password == sha1(password).hexdigest(): - user.set_password(password) - return user - - return None diff --git a/app/templates/base.html b/app/templates/base.html index f27c8a5..d63bb26 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -62,7 +62,7 @@
  • Lookup User
  • {% endif %} {% if request.user.is_staff %} -
  • Admin
  • +
  • Admin
  • {% endif %} {% if "sentry"|installed %} {% if request.user.is_superuser %} diff --git a/app/urls.py b/app/urls.py index 342b278..5165dad 100644 --- a/app/urls.py +++ b/app/urls.py @@ -4,11 +4,11 @@ from django.contrib.auth.views import login from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.conf import settings - from utils import installed from registration.views import register from sso.forms import RegistrationFormUniqueEmailBlocked + admin.autodiscover() urlpatterns = patterns('', @@ -45,7 +45,11 @@ if installed('nexus'): nexus.autodiscover() urlpatterns += patterns('', - (r'^nexus/', include(nexus.site.urls)), + (r'^admin/', include('nexus.site.urls')), + ) +else: + urlpatterns += patterns('', + url(r'^admin/', include('admin.site.urls')), ) if settings.DEBUG: