From b53c026877db629d5496585904e1b30a77afe9c9 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 14 Jan 2019 00:03:26 -0400 Subject: [PATCH] Sort arguments and imports Signed-off-by: Roberto Rosario --- mayan/apps/permissions/admin.py | 2 +- mayan/apps/permissions/apps.py | 4 ++- mayan/apps/permissions/managers.py | 2 +- .../permissions/migrations/0001_initial.py | 2 +- .../migrations/0002_auto_20150628_0533.py | 2 +- mayan/apps/permissions/permissions.py | 28 +++++++++---------- mayan/apps/permissions/tests/test_api.py | 8 ++---- mayan/apps/permissions/tests/test_models.py | 8 +++--- mayan/apps/permissions/tests/test_views.py | 2 +- mayan/apps/permissions/urls.py | 2 +- mayan/apps/permissions/views.py | 4 +-- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/mayan/apps/permissions/admin.py b/mayan/apps/permissions/admin.py index f135121177..f29de094c8 100644 --- a/mayan/apps/permissions/admin.py +++ b/mayan/apps/permissions/admin.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals from django.contrib import admin -from .models import StoredPermission, Role +from .models import Role, StoredPermission @admin.register(Role) diff --git a/mayan/apps/permissions/apps.py b/mayan/apps/permissions/apps.py index b442782a0a..00612df967 100644 --- a/mayan/apps/permissions/apps.py +++ b/mayan/apps/permissions/apps.py @@ -5,7 +5,9 @@ from django.utils.translation import ugettext_lazy as _ from mayan.apps.acls import ModelPermission from mayan.apps.acls.links import link_acl_list -from mayan.apps.acls.permissions import permission_acl_edit, permission_acl_view +from mayan.apps.acls.permissions import ( + permission_acl_edit, permission_acl_view +) from mayan.apps.common import ( MayanAppConfig, menu_list_facet, menu_multi_item, menu_object, menu_secondary, menu_setup diff --git a/mayan/apps/permissions/managers.py b/mayan/apps/permissions/managers.py index 145078094a..560878b210 100644 --- a/mayan/apps/permissions/managers.py +++ b/mayan/apps/permissions/managers.py @@ -2,8 +2,8 @@ from __future__ import unicode_literals import logging -from django.db import models from django.contrib.contenttypes.models import ContentType +from django.db import models logger = logging.getLogger(__name__) diff --git a/mayan/apps/permissions/migrations/0001_initial.py b/mayan/apps/permissions/migrations/0001_initial.py index 81ef02a769..ef67a61e02 100644 --- a/mayan/apps/permissions/migrations/0001_initial.py +++ b/mayan/apps/permissions/migrations/0001_initial.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/permissions/migrations/0002_auto_20150628_0533.py b/mayan/apps/permissions/migrations/0002_auto_20150628_0533.py index e2cb7b517b..375089fd1d 100644 --- a/mayan/apps/permissions/migrations/0002_auto_20150628_0533.py +++ b/mayan/apps/permissions/migrations/0002_auto_20150628_0533.py @@ -1,6 +1,6 @@ from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mayan/apps/permissions/permissions.py b/mayan/apps/permissions/permissions.py index 1543ab065f..4411ca53ad 100644 --- a/mayan/apps/permissions/permissions.py +++ b/mayan/apps/permissions/permissions.py @@ -6,21 +6,21 @@ from . import PermissionNamespace namespace = PermissionNamespace(label=_('Permissions'), name='permissions') -permission_role_view = namespace.add_permission( - name='role_view', label=_('View roles') -) -permission_role_edit = namespace.add_permission( - name='role_edit', label=_('Edit roles') -) -permission_role_create = namespace.add_permission( - name='role_create', label=_('Create roles') -) -permission_role_delete = namespace.add_permission( - name='role_delete', label=_('Delete roles') -) permission_permission_grant = namespace.add_permission( - name='permission_grant', label=_('Grant permissions') + label=_('Grant permissions'), name='permission_grant' ) permission_permission_revoke = namespace.add_permission( - name='permission_revoke', label=_('Revoke permissions') + label=_('Revoke permissions'), name='permission_revoke' +) +permission_role_create = namespace.add_permission( + label=_('Create roles'), name='role_create' +) +permission_role_delete = namespace.add_permission( + label=_('Delete roles'), name='role_delete' +) +permission_role_edit = namespace.add_permission( + label=_('Edit roles'), name='role_edit' +) +permission_role_view = namespace.add_permission( + label=_('View roles'), name='role_view' ) diff --git a/mayan/apps/permissions/tests/test_api.py b/mayan/apps/permissions/tests/test_api.py index 85c3c0045f..2ed28ceffb 100644 --- a/mayan/apps/permissions/tests/test_api.py +++ b/mayan/apps/permissions/tests/test_api.py @@ -10,13 +10,11 @@ from mayan.apps.user_management.tests.literals import TEST_GROUP_NAME from ..classes import Permission from ..models import Role from ..permissions import ( - permission_role_create, permission_role_delete, - permission_role_edit, permission_role_view + permission_role_create, permission_role_delete, permission_role_edit, + permission_role_view ) -from .literals import ( - TEST_ROLE_LABEL, TEST_ROLE_LABEL_EDITED -) +from .literals import TEST_ROLE_LABEL, TEST_ROLE_LABEL_EDITED from .mixins import RoleTestMixin diff --git a/mayan/apps/permissions/tests/test_models.py b/mayan/apps/permissions/tests/test_models.py index 10834d7814..550644ae92 100644 --- a/mayan/apps/permissions/tests/test_models.py +++ b/mayan/apps/permissions/tests/test_models.py @@ -5,13 +5,13 @@ from django.core.exceptions import PermissionDenied from mayan.apps.common.tests import BaseTestCase from ..classes import Permission, PermissionNamespace -from ..permissions import permission_role_view from ..models import StoredPermission +from ..permissions import permission_role_view from .literals import ( - TEST_INVALID_PERMISSION_NAMESPACE_NAME, TEST_INVALID_PERMISSION_NAME, - TEST_PERMISSION_NAMESPACE_NAME, TEST_PERMISSION_NAMESPACE_LABEL, - TEST_PERMISSION_NAME, TEST_PERMISSION_LABEL + TEST_INVALID_PERMISSION_NAME, TEST_INVALID_PERMISSION_NAMESPACE_NAME, + TEST_PERMISSION_LABEL, TEST_PERMISSION_NAME, + TEST_PERMISSION_NAMESPACE_LABEL, TEST_PERMISSION_NAMESPACE_NAME ) diff --git a/mayan/apps/permissions/tests/test_views.py b/mayan/apps/permissions/tests/test_views.py index ef49a304e5..c4c28c7fd0 100644 --- a/mayan/apps/permissions/tests/test_views.py +++ b/mayan/apps/permissions/tests/test_views.py @@ -8,7 +8,7 @@ from ..models import Role from ..permissions import ( permission_permission_grant, permission_permission_revoke, permission_role_create, permission_role_delete, permission_role_edit, - permission_role_view, + permission_role_view ) from .literals import TEST_ROLE_LABEL, TEST_ROLE_LABEL_EDITED diff --git a/mayan/apps/permissions/urls.py b/mayan/apps/permissions/urls.py index 5660c5f15c..89e1d4b7f6 100644 --- a/mayan/apps/permissions/urls.py +++ b/mayan/apps/permissions/urls.py @@ -5,7 +5,7 @@ from django.conf.urls import url from .api_views import APIPermissionList, APIRoleListView, APIRoleView from .views import ( GroupRolesView, RoleCreateView, RoleDeleteView, RoleEditView, - RoleListView, RoleGroupsView, RolePermissionsView + RoleGroupsView, RoleListView, RolePermissionsView ) urlpatterns = [ diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py index 5d70ff9d54..127312fe9a 100644 --- a/mayan/apps/permissions/views.py +++ b/mayan/apps/permissions/views.py @@ -22,8 +22,8 @@ from .links import link_role_create from .models import Role, StoredPermission from .permissions import ( permission_permission_grant, permission_permission_revoke, - permission_role_view, permission_role_create, permission_role_delete, - permission_role_edit + permission_role_create, permission_role_delete, permission_role_edit, + permission_role_view )