Remove remaining direct references to the User model. Closes GitLab issue #225.

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):

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(