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

Updated all apps and widgets with explicit safely marked strings

Browse Source
This commit is contained in:
Roberto Rosario
2011-07-01 20:53:37 -04:00
parent a0b2e5f864
commit f0f0f4fc2e
17 changed files with 119 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
apps/permissions/views.py
View File

@@ -20,6 +20,7 @@ from permissions import PERMISSION_ROLE_VIEW, PERMISSION_ROLE_EDIT, \
PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, PERMISSION_PERMISSION_GRANT, \
PERMISSION_PERMISSION_REVOKE
from permissions.api import check_permissions, namespace_titles
from permissions.widgets import role_permission_link
def role_list(request):
@@ -36,23 +37,6 @@ def role_list(request):
)
def _role_permission_link(requester, permission, permission_list):
ct = ContentType.objects.get_for_model(requester)
template = u'<span class="nowrap"><a href="%(url)s"><span class="famfam active famfam-%(icon)s"></span>%(text)s</a></span>'
if permission in permission_list:
return template % {
'url': reverse('permission_revoke',
args=[permission.pk, ct.app_label, ct.model, requester.pk]),
'icon': u'key_delete', 'text': ugettext(u'Revoke')}
else:
return template % {
'url': reverse('permission_grant',
args=[permission.pk, ct.app_label, ct.model, requester.pk]),
'icon': u'key_add', 'text': ugettext(u'Grant')}
def role_permissions(request, role_id):
check_permissions(request.user, [PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE])
@@ -71,7 +55,7 @@ def role_permissions(request, role_id):
{'name': _(u'name'), 'attribute': u'label'},
{
'name':_(u'state'),
'attribute': lambda x: _role_permission_link(role, x, role_permissions_list),
'attribute': lambda x: role_permission_link(role, x, role_permissions_list),
}
],
'hide_link': True,

21
apps/permissions/widgets.py Normal file
View File

@@ -0,0 +1,21 @@
from django.utils.translation import ugettext
from django.utils.safestring import mark_safe
from django.contrib.contenttypes.models import ContentType
from django.core.urlresolvers import reverse
def role_permission_link(requester, permission, permission_list):
ct = ContentType.objects.get_for_model(requester)
template = u'<span class="nowrap"><a href="%(url)s"><span class="famfam active famfam-%(icon)s"></span>%(text)s</a></span>'
if permission in permission_list:
return mark_safe(template % {
'url': reverse('permission_revoke',
args=[permission.pk, ct.app_label, ct.model, requester.pk]),
'icon': u'key_delete', 'text': ugettext(u'Revoke')})
else:
return mark_safe(template % {
'url': reverse('permission_grant',
args=[permission.pk, ct.app_label, ct.model, requester.pk]),
'icon': u'key_add', 'text': ugettext(u'Grant')})