From aea00db37e0b1b0dde38b65f8be00af89bf325d1 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 31 May 2016 01:23:24 -0400 Subject: [PATCH] Replace imports of Group for MayanGroup. --- mayan/apps/user_management/api_views.py | 10 +++++----- mayan/apps/user_management/apps.py | 16 ++++++++++----- mayan/apps/user_management/models.py | 2 -- mayan/apps/user_management/tests/test_api.py | 21 ++------------------ 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/mayan/apps/user_management/api_views.py b/mayan/apps/user_management/api_views.py index 945267fc5a..de0974d9d9 100644 --- a/mayan/apps/user_management/api_views.py +++ b/mayan/apps/user_management/api_views.py @@ -1,13 +1,13 @@ from __future__ import unicode_literals from django.contrib.auth import get_user_model -from django.contrib.auth.models import Group from rest_framework import generics from rest_api.filters import MayanObjectPermissionsFilter from rest_api.permissions import MayanPermission +from .models import MayanGroup from .permissions import ( permission_group_create, permission_group_delete, permission_group_edit, permission_group_view, permission_user_create, permission_user_delete, @@ -21,7 +21,7 @@ class APIGroupListView(generics.ListCreateAPIView): mayan_object_permissions = {'GET': (permission_group_view,)} mayan_view_permissions = {'POST': (permission_group_create,)} permission_classes = (MayanPermission,) - queryset = Group.objects.all() + queryset = MayanGroup.on_organization.all() serializer_class = GroupSerializer def get(self, *args, **kwargs): @@ -47,7 +47,7 @@ class APIGroupView(generics.RetrieveUpdateDestroyAPIView): 'DELETE': (permission_group_delete,) } permission_classes = (MayanPermission,) - queryset = Group.objects.all() + queryset = MayanGroup.on_organization.all() serializer_class = GroupSerializer def delete(self, *args, **kwargs): @@ -84,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 = get_user_model().objects.all() + queryset = get_user_model().on_organization.all() serializer_class = UserSerializer def get(self, *args, **kwargs): @@ -109,7 +109,7 @@ class APIUserView(generics.RetrieveUpdateDestroyAPIView): 'DELETE': (permission_user_delete,) } permission_classes = (MayanPermission,) - queryset = get_user_model().objects.all() + queryset = get_user_model().on_organization.all() serializer_class = UserSerializer def delete(self, *args, **kwargs): diff --git a/mayan/apps/user_management/apps.py b/mayan/apps/user_management/apps.py index c117d2dcf7..747f948352 100644 --- a/mayan/apps/user_management/apps.py +++ b/mayan/apps/user_management/apps.py @@ -1,5 +1,7 @@ from __future__ import unicode_literals +from django.apps import apps +from django.contrib import admin from django.contrib.auth import get_user_model from django.contrib.auth.models import Group from django.utils.translation import ugettext_lazy as _ @@ -23,11 +25,12 @@ from .links import ( def get_groups(): - return ','.join([group.name for group in Group.objects.all()]) + MayanGroup = apps.get_model('user_management', 'MayanGroup') + return ','.join([group.name for group in MayanGroup.on_organization.all()]) def get_users(): - return ','.join([user.get_full_name() or user.username for user in get_user_model().objects.all()]) + return ','.join([user.get_full_name() or user.username for user in get_user_model().on_organization.all()]) class UserManagementApp(MayanAppConfig): @@ -38,6 +41,7 @@ class UserManagementApp(MayanAppConfig): def ready(self): super(UserManagementApp, self).ready() + MayanGroup = self.get_model('MayanGroup') User = get_user_model() @@ -53,7 +57,7 @@ class UserManagementApp(MayanAppConfig): ) SourceColumn( - source=Group, label=_('Members'), attribute='users.count' + source=MayanGroup, label=_('Members'), attribute='users.count' ) SourceColumn( @@ -75,13 +79,15 @@ class UserManagementApp(MayanAppConfig): ) ) + admin.site.unregister(Group) + menu_multi_item.bind_links( links=(link_user_multiple_set_password, link_user_multiple_delete), sources=('user_management:user_list',) ) menu_object.bind_links( links=(link_group_edit, link_group_members, link_group_delete), - sources=(Group,) + sources=(MayanGroup,) ) menu_object.bind_links( links=( @@ -106,5 +112,5 @@ class UserManagementApp(MayanAppConfig): ) menu_setup.bind_links(links=(link_user_setup, link_group_setup)) - registry.register(Group) + registry.register(MayanGroup) registry.register(User) diff --git a/mayan/apps/user_management/models.py b/mayan/apps/user_management/models.py index 8ad30c404a..ef271e895c 100644 --- a/mayan/apps/user_management/models.py +++ b/mayan/apps/user_management/models.py @@ -3,9 +3,7 @@ from __future__ import unicode_literals from django.contrib.auth.models import ( AbstractUser, Group, GroupManager, UserManager ) -from django.core.urlresolvers import reverse from django.db import models -from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ from organizations.models import Organization diff --git a/mayan/apps/user_management/tests/test_api.py b/mayan/apps/user_management/tests/test_api.py index e5eb2b561c..126ff3f6df 100644 --- a/mayan/apps/user_management/tests/test_api.py +++ b/mayan/apps/user_management/tests/test_api.py @@ -4,11 +4,7 @@ from django.contrib.auth import get_user_model from django.core.urlresolvers import reverse -from rest_framework.test import APITestCase - -from ..tests.literals import ( - TEST_ADMIN_EMAIL, TEST_ADMIN_PASSWORD, TEST_ADMIN_USERNAME -) +from rest_api.tests.base import GenericAPITestCase from .literals import ( TEST_USER_EMAIL, TEST_USER_PASSWORD, TEST_USER_USERNAME, @@ -16,24 +12,11 @@ from .literals import ( ) -class UserManagementAPITestCase(APITestCase): +class UserManagementAPITestCase(GenericAPITestCase): """ Test the document type API endpoints """ - def setUp(self): - self.admin_user = get_user_model().objects.create_superuser( - username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, - password=TEST_ADMIN_PASSWORD - ) - - self.client.login( - username=TEST_ADMIN_USERNAME, password=TEST_ADMIN_PASSWORD - ) - - def tearDown(self): - get_user_model().objects.all().delete() - def test_user_create(self): response = self.client.post( reverse('rest_api:user-list'), data={