Remove remaining direct references to the User model. Closes GitLab issue #225.
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import logging
|
||||
|
||||
from django.apps import apps
|
||||
from django.contrib.auth.models import User
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.core.files import File
|
||||
from django.db import OperationalError
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
@@ -56,7 +56,7 @@ def task_upload_document(self, source_id, document_type_id, shared_uploaded_file
|
||||
)
|
||||
|
||||
if user_id:
|
||||
user = User.objects.get(pk=user_id)
|
||||
user = get_user_model().objects.get(pk=user_id)
|
||||
else:
|
||||
user = None
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.contrib.auth.models import User
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.test.client import Client
|
||||
from django.test import TestCase, override_settings
|
||||
@@ -31,7 +31,7 @@ class UploadDocumentTestCase(TestCase):
|
||||
label=TEST_DOCUMENT_TYPE
|
||||
)
|
||||
|
||||
self.admin_user = User.objects.create_superuser(
|
||||
self.admin_user = get_user_model().objects.create_superuser(
|
||||
username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL,
|
||||
password=TEST_ADMIN_PASSWORD
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user