matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sort arguments and imports

Browse Source 
Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2019-01-14 00:03:26 -04:00
parent 097ac7dae6
commit b53c026877
11 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mayan/apps/permissions/admin.py
View File

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

4
mayan/apps/permissions/apps.py
View File

@@ -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

2
mayan/apps/permissions/managers.py
View File

@@ -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__)

2
mayan/apps/permissions/migrations/0001_initial.py
View File

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

2
mayan/apps/permissions/migrations/0002_auto_20150628_0533.py
View File

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

28
mayan/apps/permissions/permissions.py
View File

@@ -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'
)

8
mayan/apps/permissions/tests/test_api.py
View File

@@ -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

8
mayan/apps/permissions/tests/test_models.py
View File

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

2
mayan/apps/permissions/tests/test_views.py
View File

@@ -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

2
mayan/apps/permissions/urls.py
View File

@@ -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 = [

4
mayan/apps/permissions/views.py
View File

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