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

Import cleanups, reorganization, PEP8 cleanups

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-02 02:01:08 -04:00
parent 1c50bca38a
commit 74cf4c413f
28 changed files with 119 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mayan/apps/permissions/__init__.py
+5 -5
View File
@@ -8,13 +8,13 @@ from navigation.api import register_links, register_multi_item_links
from project_setup.api import register_setup
from .models import Role
from .links import (role_list, role_create, role_edit, role_members,
role_permissions, role_delete, permission_grant,
permission_revoke)
from .links import (permission_grant, permission_revoke, role_create,
role_delete, role_edit, role_list, role_members,
role_permissions)
from .settings import DEFAULT_ROLES
register_links(Role, [role_edit, role_delete, role_permissions, role_members])
register_links([Role, 'permissions:role_list', 'permissions:role_create'], [role_list, role_create], menu_name='secondary_menu')
register_links(Role, [role_delete, role_edit, role_members, role_permissions])
register_links([Role, 'permissions:role_create', 'permissions:role_list'], [role_create, role_list], menu_name='secondary_menu')
register_multi_item_links(['permissions:role_permissions'], [permission_grant, permission_revoke])
permission_views = ['permissions:role_list', 'permissions:role_create', 'permissions:role_edit', 'permissions:role_members', 'permissions:role_permissions', 'permissions:role_delete']
mayan/apps/permissions/links.py
+11 -10
View File
@@ -2,16 +2,17 @@ from __future__ import absolute_import
from django.utils.translation import ugettext_lazy as _
from .permissions import (PERMISSION_ROLE_VIEW, PERMISSION_ROLE_EDIT,
PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE,
PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE)
role_list = {'text': _(u'Roles'), 'view': 'permissions:role_list', 'famfam': 'medal_gold_1', 'icon': 'medal_gold_1.png', 'permissions': [PERMISSION_ROLE_VIEW], 'children_view_regex': [r'^permission_', r'^role_']}
role_create = {'text': _(u'Create new role'), 'view': 'permissions:role_create', 'famfam': 'medal_gold_add', 'permissions': [PERMISSION_ROLE_CREATE]}
role_edit = {'text': _(u'Edit'), 'view': 'permissions:role_edit', 'args': 'object.id', 'famfam': 'medal_gold_1', 'permissions': [PERMISSION_ROLE_EDIT]}
role_members = {'text': _(u'Members'), 'view': 'permissions:role_members', 'args': 'object.id', 'famfam': 'group_key', 'permissions': [PERMISSION_ROLE_EDIT]}
role_permissions = {'text': _(u'Role permissions'), 'view': 'permissions:role_permissions', 'args': 'object.id', 'famfam': 'key_go', 'permissions': [PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE]}
role_delete = {'text': _(u'Delete'), 'view': 'permissions:role_delete', 'args': 'object.id', 'famfam': 'medal_gold_delete', 'permissions': [PERMISSION_ROLE_DELETE]}
from .permissions import (PERMISSION_PERMISSION_GRANT,
PERMISSION_PERMISSION_REVOKE, PERMISSION_ROLE_CREATE,
PERMISSION_ROLE_DELETE, PERMISSION_ROLE_EDIT,
PERMISSION_ROLE_VIEW)
permission_grant = {'text': _(u'Grant'), 'view': 'permissions:permission_multiple_grant', 'famfam': 'key_add', 'permissions': [PERMISSION_PERMISSION_GRANT]}
permission_revoke = {'text': _(u'Revoke'), 'view': 'permissions:permission_multiple_revoke', 'famfam': 'key_delete', 'permissions': [PERMISSION_PERMISSION_REVOKE]}
role_create = {'text': _(u'Create new role'), 'view': 'permissions:role_create', 'famfam': 'medal_gold_add', 'permissions': [PERMISSION_ROLE_CREATE]}
role_delete = {'text': _(u'Delete'), 'view': 'permissions:role_delete', 'args': 'object.id', 'famfam': 'medal_gold_delete', 'permissions': [PERMISSION_ROLE_DELETE]}
role_edit = {'text': _(u'Edit'), 'view': 'permissions:role_edit', 'args': 'object.id', 'famfam': 'medal_gold_1', 'permissions': [PERMISSION_ROLE_EDIT]}
role_list = {'text': _(u'Roles'), 'view': 'permissions:role_list', 'famfam': 'medal_gold_1', 'icon': 'medal_gold_1.png', 'permissions': [PERMISSION_ROLE_VIEW], 'children_view_regex': [r'^permission_', r'^role_']}
role_members = {'text': _(u'Members'), 'view': 'permissions:role_members', 'args': 'object.id', 'famfam': 'group_key', 'permissions': [PERMISSION_ROLE_EDIT]}
role_permissions = {'text': _(u'Role permissions'), 'view': 'permissions:role_permissions', 'args': 'object.id', 'famfam': 'key_go', 'permissions': [PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE]}
mayan/apps/permissions/views.py
+10 -9
View File
@@ -5,26 +5,27 @@ from json import loads
import operator
from django.contrib import messages
from django.contrib.auth.models import User, Group
from django.contrib.auth.models import Group, User
from django.contrib.contenttypes.models import ContentType
from django.core.urlresolvers import reverse_lazy
from django.http import HttpResponseRedirect, Http404
from django.shortcuts import render_to_response, get_object_or_404
from django.http import Http404, HttpResponseRedirect
from django.shortcuts import get_object_or_404, render_to_response
from django.template import RequestContext
from django.utils.translation import ugettext_lazy as _
from acls.classes import EncapsulatedObject
from common.models import AnonymousUserSingleton
from common.views import assign_remove
from common.views import SingleObjectCreateView, SingleObjectDeleteView, SingleObjectEditView
from common.views import (SingleObjectCreateView, SingleObjectDeleteView,
SingleObjectEditView, assign_remove)
from common.utils import encapsulate, get_object_name
from common.widgets import two_state_template
from .forms import RoleForm, RoleForm_view
from .models import Role, Permission
from .permissions import (PERMISSION_ROLE_VIEW, PERMISSION_ROLE_EDIT,
PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE,
PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE)
from .models import Permission, Role
from .permissions import (PERMISSION_PERMISSION_GRANT,
PERMISSION_PERMISSION_REVOKE, PERMISSION_ROLE_VIEW,
PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE,
PERMISSION_ROLE_EDIT)
class RoleCreateView(SingleObjectCreateView):