diff --git a/mayan/apps/acls/tests/test_models.py b/mayan/apps/acls/tests/test_models.py index ef21022cad..b12aaefb14 100644 --- a/mayan/apps/acls/tests/test_models.py +++ b/mayan/apps/acls/tests/test_models.py @@ -53,7 +53,7 @@ class PermissionTestCase(TestCase): self.group = MayanGroup.on_organization.create(name=TEST_GROUP) self.role = Role.on_organization.create(label=TEST_ROLE_LABEL) - self.group.user_set.add(self.user) + self.group.users.add(self.user) self.role.organization_groups.add(self.group) Permission.invalidate_cache() diff --git a/mayan/apps/acls/tests/test_views.py b/mayan/apps/acls/tests/test_views.py index c7347cd6c7..9f5282acbf 100644 --- a/mayan/apps/acls/tests/test_views.py +++ b/mayan/apps/acls/tests/test_views.py @@ -93,7 +93,7 @@ class AccessControlListViewTestCase(GenericDocumentViewTestCase): recent_entry = self.document.add_as_recent_document_for_user(self.user) - content_type = ContentType.on_organization.get_for_model(recent_entry) + content_type = ContentType.objects.get_for_model(recent_entry) view_arguments = { 'app_label': content_type.app_label, diff --git a/mayan/apps/common/tests/test_views.py b/mayan/apps/common/tests/test_views.py index 8635ddd95b..d2530fb79e 100644 --- a/mayan/apps/common/tests/test_views.py +++ b/mayan/apps/common/tests/test_views.py @@ -36,7 +36,7 @@ class GenericViewTestCase(TestCase): self.group = MayanGroup.on_organization.create(name=TEST_GROUP) self.role = Role.on_organization.create(label=TEST_ROLE_LABEL) - self.group.user_set.add(self.user) + self.group.users.add(self.user) self.role.organization_groups.add(self.group) Permission.invalidate_cache() diff --git a/mayan/apps/organizations/apps.py b/mayan/apps/organizations/apps.py index 847c307836..d18968c50e 100644 --- a/mayan/apps/organizations/apps.py +++ b/mayan/apps/organizations/apps.py @@ -6,7 +6,14 @@ from django.utils.translation import ugettext_lazy as _ from common.apps import MayanAppConfig +from .utils import create_default_organization + class OrganizationApp(AppConfig): name = 'organizations' verbose_name = _('Organizations') + + def ready(self): + super(OrganizationApp, self).ready() + Organization = self.get_model('Organization') + create_default_organization(verbosity=0) diff --git a/mayan/apps/permissions/tests/test_models.py b/mayan/apps/permissions/tests/test_models.py index 78bae6a743..6a930f28ca 100644 --- a/mayan/apps/permissions/tests/test_models.py +++ b/mayan/apps/permissions/tests/test_models.py @@ -9,7 +9,7 @@ from user_management.models import MayanGroup from user_management.tests import TEST_GROUP, TEST_USER_USERNAME from ..classes import Permission -from ..models import Role +from ..models import Role, StoredPermission from ..permissions import permission_role_view from .literals import TEST_ROLE_LABEL @@ -32,7 +32,7 @@ class PermissionTestCase(TestCase): ) def test_with_permissions(self): - self.group.user_set.add(self.user) + self.group.users.add(self.user) self.role.permissions.add(permission_role_view.stored_permission) self.role.organization_groups.add(self.group) diff --git a/mayan/apps/smart_settings/tests/test_view_permissions.py b/mayan/apps/smart_settings/tests/test_view_permissions.py index f68757cd9b..f53beec21b 100644 --- a/mayan/apps/smart_settings/tests/test_view_permissions.py +++ b/mayan/apps/smart_settings/tests/test_view_permissions.py @@ -1,7 +1,6 @@ from __future__ import absolute_import, unicode_literals from django.contrib.auth import get_user_model -from django.contrib.auth.models import Group from django.core.urlresolvers import reverse from django.test.client import Client from django.test import TestCase @@ -9,6 +8,7 @@ from django.test import TestCase from permissions.classes import Permission from permissions.models import Role from permissions.tests import TEST_ROLE +from user_management.models import MayanGroup from ..permissions import permission_settings_view @@ -20,14 +20,14 @@ TEST_USERNAME = 'test_user' class SmartSettingViewPermissionsTestCase(TestCase): def setUp(self): - self.user = get_user_model().objects.create_user( + self.user = get_user_model().on_organization.create_user( username=TEST_USERNAME, email=TEST_EMAIL, password=TEST_PASSWORD ) - self.group = Group.objects.create(name=TEST_GROUP) - self.role = Role.objects.create(label=TEST_ROLE) + self.group = MayanGroup.on_organization.create(name=TEST_GROUP) + self.role = Role.on_organization.create(label=TEST_ROLE) - self.group.user_set.add(self.user) + self.group.users.add(self.user) self.role.groups.add(self.group) Permission.invalidate_cache() diff --git a/mayan/apps/user_management/apps.py b/mayan/apps/user_management/apps.py index 992b11dc9c..c117d2dcf7 100644 --- a/mayan/apps/user_management/apps.py +++ b/mayan/apps/user_management/apps.py @@ -53,7 +53,7 @@ class UserManagementApp(MayanAppConfig): ) SourceColumn( - source=Group, label=_('Members'), attribute='user_set.count' + source=Group, label=_('Members'), attribute='users.count' ) SourceColumn( diff --git a/mayan/apps/user_management/models.py b/mayan/apps/user_management/models.py index 3abb5fae9e..8ad30c404a 100644 --- a/mayan/apps/user_management/models.py +++ b/mayan/apps/user_management/models.py @@ -36,7 +36,7 @@ class MayanUser(AbstractUser): MayanGroup, blank=True, help_text=_( 'The groups this user belongs to. A user will get all permissions ' 'granted to each of their groups.' - ), related_name='organization_user_set', related_query_name='user', + ), related_name='users', related_query_name='user', verbose_name=_('Groups') ) diff --git a/mayan/apps/user_management/serializers.py b/mayan/apps/user_management/serializers.py index ad8f4172a2..c7b36b5981 100644 --- a/mayan/apps/user_management/serializers.py +++ b/mayan/apps/user_management/serializers.py @@ -18,7 +18,7 @@ class GroupSerializer(serializers.HyperlinkedModelSerializer): model = MayanGroup def get_users_count(self, instance): - return instance.user_set.count() + return instance.users.count() class UserSerializer(serializers.HyperlinkedModelSerializer): diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py index 709ae36860..73eae47af0 100644 --- a/mayan/apps/user_management/views.py +++ b/mayan/apps/user_management/views.py @@ -94,7 +94,7 @@ class GroupMembersView(AssignRemoveView): return sorted(results, key=lambda x: x[1]) def add(self, item): - self.get_object().user_set.add(item) + self.get_object().users.add(item) def get_extra_context(self): return { @@ -116,11 +116,11 @@ class GroupMembersView(AssignRemoveView): def right_list(self): return GroupMembersView.generate_choices( - self.get_object().user_set.all() + self.get_object().users.all() ) def remove(self, item): - self.get_object().user_set.remove(item) + self.get_object().users.remove(item) class UserEditView(SingleObjectEditView): @@ -145,7 +145,7 @@ class UserGroupsView(AssignRemoveView): view_permission = permission_user_edit def add(self, item): - item.user_set.add(self.get_object()) + item.users.add(self.get_object()) def get_extra_context(self): return { @@ -167,7 +167,7 @@ class UserGroupsView(AssignRemoveView): ) def remove(self, item): - item.user_set.remove(self.get_object()) + item.users.remove(self.get_object()) class UserListView(SingleObjectListView):