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

Added encapsulate factory function to get around Django bug #15791

Browse Source
This commit is contained in:
Roberto Rosario
2011-08-05 09:30:26 -04:00
parent 7b0e177ba2
commit 1b7183be85
15 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/permissions/views.py
View File

@@ -11,7 +11,7 @@ from django.core.exceptions import ObjectDoesNotExist
from django.contrib.auth.models import User, Group
from common.views import assign_remove
from common.utils import generate_choices_w_labels
from common.utils import generate_choices_w_labels, encapsulate
from permissions.models import Role, Permission, PermissionHolder, RoleMember
from permissions.forms import RoleForm, RoleForm_view
@@ -50,11 +50,11 @@ def role_permissions(request, role_id):
'title': _(u'permissions'),
'object_list': Permission.objects.all(),
'extra_columns': [
{'name': _(u'namespace'), 'attribute': lambda x: namespace_titles[x.namespace] if x.namespace in namespace_titles else x.namespace},
{'name': _(u'namespace'), 'attribute': encapsulate(lambda x: namespace_titles[x.namespace] if x.namespace in namespace_titles else x.namespace)},
{'name': _(u'name'), 'attribute': u'label'},
{
'name':_(u'state'),
'attribute': lambda x: role_permission_link(role, x, role_permissions_list),
'attribute': encapsulate(lambda x: role_permission_link(role, x, role_permissions_list)),
}
],
'hide_link': True,