diff --git a/mayan/apps/permissions/apps.py b/mayan/apps/permissions/apps.py index d6b0264e70..25ec68903d 100644 --- a/mayan/apps/permissions/apps.py +++ b/mayan/apps/permissions/apps.py @@ -9,7 +9,6 @@ from common import ( ) from rest_api.classes import APIEndPoint -from .handlers import apply_default_roles from .models import Role from .links import ( link_permission_grant, link_permission_revoke, link_role_create, @@ -31,5 +30,3 @@ class PermissionsApp(MayanAppConfig): menu_multi_item.bind_links(links=[link_permission_grant, link_permission_revoke], sources=['permissions:role_permissions']) menu_secondary.bind_links(links=[link_role_list, link_role_create], sources=[Role, 'permissions:role_create', 'permissions:role_list']) menu_setup.bind_links(links=[link_role_list]) - - post_save.connect(apply_default_roles, dispatch_uid='apply_default_roles', sender=User) diff --git a/mayan/apps/permissions/handlers.py b/mayan/apps/permissions/handlers.py deleted file mode 100644 index f3d3e87d40..0000000000 --- a/mayan/apps/permissions/handlers.py +++ /dev/null @@ -1,22 +0,0 @@ -from __future__ import unicode_literals - -from django.core.exceptions import ObjectDoesNotExist - -from .models import Role - -from .settings import setting_default_roles - - -def apply_default_roles(sender, instance, **kwargs): - if kwargs.get('created', False): - for default_role in setting_default_roles.value: - if isinstance(default_role, Role): - # If a model is passed, execute method - default_role.add_member(instance) - else: - # If a role name is passed, lookup the corresponding model - try: - role = Role.objects.get(name=default_role) - role.add_member(instance) - except ObjectDoesNotExist: - pass diff --git a/mayan/apps/permissions/settings.py b/mayan/apps/permissions/settings.py deleted file mode 100644 index 172c724749..0000000000 --- a/mayan/apps/permissions/settings.py +++ /dev/null @@ -1,8 +0,0 @@ -from __future__ import unicode_literals - -from django.utils.translation import ugettext_lazy as _ - -from smart_settings import Namespace - -namespace = Namespace(name='permissions', label=_('Permissions')) -setting_default_roles = namespace.add_setting(global_name='ROLES_DEFAULT_ROLES', default=[], help_text=_('A list of existing roles that are automatically assigned to newly created users.'))