diff --git a/mayan/apps/authentication/tests/test_views.py b/mayan/apps/authentication/tests/test_views.py index edd4b3ef2f..8c02c02ee4 100644 --- a/mayan/apps/authentication/tests/test_views.py +++ b/mayan/apps/authentication/tests/test_views.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, unicode_literals from django.conf import settings -from django.contrib.auth.models import User +from django.contrib.auth import get_user_model from django.core.urlresolvers import reverse from django.test import TestCase, override_settings from django.test.client import Client @@ -19,7 +19,7 @@ class UserLoginTestCase(TestCase): """ def setUp(self): - 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 ) diff --git a/mayan/apps/document_states/tests/test_views.py b/mayan/apps/document_states/tests/test_views.py index 1641775012..283ba7833d 100644 --- a/mayan/apps/document_states/tests/test_views.py +++ b/mayan/apps/document_states/tests/test_views.py @@ -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.files import File from django.core.urlresolvers import reverse from django.test.client import Client @@ -25,7 +25,7 @@ from .literals import ( class DocumentStateViewTestCase(TestCase): def setUp(self): - 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 ) diff --git a/mayan/apps/documents/tasks.py b/mayan/apps/documents/tasks.py index 4427eb3145..744385928c 100644 --- a/mayan/apps/documents/tasks.py +++ b/mayan/apps/documents/tasks.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import logging from django.apps import apps -from django.contrib.auth.models import User +from django.contrib.auth import get_user_model from django.db import OperationalError from mayan.celery import app @@ -100,7 +100,7 @@ def task_upload_new_document(self, document_type_id, shared_uploaded_file_id, de pk=shared_uploaded_file_id ) if user_id: - user = User.objects.get(pk=user_id) + user = get_user_model().objects.get(pk=user_id) else: user = None @@ -150,7 +150,7 @@ def task_upload_new_version(self, document_id, shared_uploaded_file_id, user_id, pk=shared_uploaded_file_id ) if user_id: - user = User.objects.get(pk=user_id) + user = get_user_model().objects.get(pk=user_id) else: user = None diff --git a/mayan/apps/documents/tests/test_api.py b/mayan/apps/documents/tests/test_api.py index 75d668342f..9f0c1e50fd 100644 --- a/mayan/apps/documents/tests/test_api.py +++ b/mayan/apps/documents/tests/test_api.py @@ -6,7 +6,8 @@ import time from json import loads -from django.contrib.auth.models import User +from django.contrib.auth import get_user_model + from django.core.files import File from django.core.urlresolvers import reverse from django.test import override_settings @@ -32,7 +33,7 @@ class DocumentTypeAPITestCase(APITestCase): """ def setUp(self): - 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 ) @@ -95,7 +96,7 @@ class DocumentAPITestCase(APITestCase): """ def setUp(self): - 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 ) diff --git a/mayan/apps/dynamic_search/tests/test_api.py b/mayan/apps/dynamic_search/tests/test_api.py index a09c384b1f..632a240ea6 100644 --- a/mayan/apps/dynamic_search/tests/test_api.py +++ b/mayan/apps/dynamic_search/tests/test_api.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from json import loads -from django.contrib.auth.models import User +from django.contrib.auth import get_user_model from django.core.files import File from django.core.urlresolvers import reverse from django.test import override_settings @@ -23,7 +23,7 @@ class SearchAPITestCase(APITestCase): """ def setUp(self): - 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 ) diff --git a/mayan/apps/dynamic_search/tests/test_models.py b/mayan/apps/dynamic_search/tests/test_models.py index 7d8244ca0c..559f9ae697 100644 --- a/mayan/apps/dynamic_search/tests/test_models.py +++ b/mayan/apps/dynamic_search/tests/test_models.py @@ -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.files.base import File from django.test import TestCase @@ -14,7 +14,7 @@ from user_management.tests import ( class DocumentSearchTestCase(TestCase): def setUp(self): - 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 ) diff --git a/mayan/apps/dynamic_search/tests/test_views.py b/mayan/apps/dynamic_search/tests/test_views.py index 9a349e3a7a..b6640e170b 100644 --- a/mayan/apps/dynamic_search/tests/test_views.py +++ b/mayan/apps/dynamic_search/tests/test_views.py @@ -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.files.base import File from django.core.urlresolvers import reverse from django.test import TestCase @@ -20,7 +20,7 @@ class Issue46TestCase(TestCase): """ def setUp(self): - 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 ) diff --git a/mayan/apps/folders/tests/test_api.py b/mayan/apps/folders/tests/test_api.py index 94301ce285..b3e75e2999 100644 --- a/mayan/apps/folders/tests/test_api.py +++ b/mayan/apps/folders/tests/test_api.py @@ -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.files import File from django.core.urlresolvers import reverse from django.test import override_settings @@ -24,7 +24,7 @@ class FolderAPITestCase(APITestCase): """ def setUp(self): - 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 ) diff --git a/mayan/apps/folders/tests/test_models.py b/mayan/apps/folders/tests/test_models.py index 196429c25c..bd2ce4f2de 100644 --- a/mayan/apps/folders/tests/test_models.py +++ b/mayan/apps/folders/tests/test_models.py @@ -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.files.base import File from django.test import TestCase @@ -24,7 +24,7 @@ class FolderTestCase(TestCase): file_object=File(file_object) ) - self.user = User.objects.create_superuser( + self.user = get_user_model().objects.create_superuser( username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, password=TEST_ADMIN_PASSWORD ) diff --git a/mayan/apps/ocr/tests/test_api.py b/mayan/apps/ocr/tests/test_api.py index 6e2ef8a01e..11855f280b 100644 --- a/mayan/apps/ocr/tests/test_api.py +++ b/mayan/apps/ocr/tests/test_api.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import json -from django.contrib.auth.models import User +from django.contrib.auth import get_user_model from django.core.files import File from django.core.urlresolvers import reverse @@ -22,7 +22,7 @@ class OCRAPITestCase(APITestCase): """ def setUp(self): - 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 ) diff --git a/mayan/apps/sources/tasks.py b/mayan/apps/sources/tasks.py index 3dc60a1242..5d75516dec 100644 --- a/mayan/apps/sources/tasks.py +++ b/mayan/apps/sources/tasks.py @@ -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 diff --git a/mayan/apps/sources/tests/test_views.py b/mayan/apps/sources/tests/test_views.py index 0a2960cc0d..5c75b39022 100644 --- a/mayan/apps/sources/tests/test_views.py +++ b/mayan/apps/sources/tests/test_views.py @@ -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 ) diff --git a/mayan/apps/tags/tests/test_api.py b/mayan/apps/tags/tests/test_api.py index 582242fed9..73ec5b9f14 100644 --- a/mayan/apps/tags/tests/test_api.py +++ b/mayan/apps/tags/tests/test_api.py @@ -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.files import File from django.core.urlresolvers import reverse from django.test import override_settings @@ -27,7 +27,7 @@ class TagAPITestCase(APITestCase): """ def setUp(self): - 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 ) diff --git a/mayan/apps/user_management/api_views.py b/mayan/apps/user_management/api_views.py index d4cb4e8fce..945267fc5a 100644 --- a/mayan/apps/user_management/api_views.py +++ b/mayan/apps/user_management/api_views.py @@ -1,6 +1,7 @@ from __future__ import unicode_literals -from django.contrib.auth.models import Group, User +from django.contrib.auth import get_user_model +from django.contrib.auth.models import Group from rest_framework import generics @@ -83,7 +84,7 @@ class APIUserListView(generics.ListCreateAPIView): mayan_object_permissions = {'GET': (permission_user_view,)} mayan_view_permissions = {'POST': (permission_user_create,)} permission_classes = (MayanPermission,) - queryset = User.objects.all() + queryset = get_user_model().objects.all() serializer_class = UserSerializer def get(self, *args, **kwargs): @@ -108,7 +109,7 @@ class APIUserView(generics.RetrieveUpdateDestroyAPIView): 'DELETE': (permission_user_delete,) } permission_classes = (MayanPermission,) - queryset = User.objects.all() + queryset = get_user_model().objects.all() serializer_class = UserSerializer def delete(self, *args, **kwargs): diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py index 5ac4cf73cf..d90cad59ac 100644 --- a/mayan/apps/user_management/views.py +++ b/mayan/apps/user_management/views.py @@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals from django.conf import settings from django.contrib import messages from django.contrib.auth import get_user_model -from django.contrib.auth.models import Group, User +from django.contrib.auth.models import Group from django.core.urlresolvers import reverse, reverse_lazy from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404, render_to_response @@ -86,7 +86,7 @@ class GroupMembersView(AssignRemoveView): def left_list(self): return AssignRemoveView.generate_choices( - User.objects.exclude( + get_user_model().objects.exclude( groups=self.get_object() ).exclude(is_staff=True).exclude(is_superuser=True) ) @@ -131,7 +131,7 @@ class UserGroupsView(AssignRemoveView): } def get_object(self): - return get_object_or_404(User, pk=self.kwargs['pk']) + return get_object_or_404(get_user_model(), pk=self.kwargs['pk']) def left_list(self): return AssignRemoveView.generate_choices(