From: Diane Trout Date: Thu, 2 Jun 2016 20:43:28 +0000 (-0700) Subject: Update custom user model for django 1.9ish. X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=ec45e54f3c068de191428e7e1b97f31ffe71b016 Update custom user model for django 1.9ish. They implemented some nicer ways of overriding the user model --- diff --git a/samples/auth_backend.py b/samples/auth_backend.py index 18fbe5c..bfda0d6 100644 --- a/samples/auth_backend.py +++ b/samples/auth_backend.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, print_function, unicode_literals from django.conf import settings from django.contrib.auth.backends import ModelBackend from django.core.exceptions import ImproperlyConfigured -from django.db.models import get_model +from django.contrib.auth import get_user_model import logging import sys @@ -32,7 +32,7 @@ class HTSUserModelBackend(ModelBackend): @property def user_class(self): if not hasattr(self, '_user_class'): - self._user_class = get_model(*settings.CUSTOM_USER_MODEL.split('.', 2)) + self._user_class = get_user_model() if not self._user_class: raise ImproperlyConfigured('Could not get custom user model') return self._user_class diff --git a/samples/models.py b/samples/models.py index acf66e9..32a917e 100644 --- a/samples/models.py +++ b/samples/models.py @@ -480,6 +480,7 @@ class HTSUser(User): # objects = UserManager() class Meta: + proxy = True ordering = ['first_name', 'last_name', 'username'] def admin_url(self):