From 9823a59eea8f9997c08c5a99a22d162e7f3565ac Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 1 Jul 2011 23:36:18 -0400 Subject: [PATCH] Added a new permission, PERMISSION_TAG_VIEW to allow users to view a documents tags --- apps/tags/__init__.py | 2 ++ apps/tags/views.py | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/tags/__init__.py b/apps/tags/__init__.py index 60b201b77a..950b353466 100644 --- a/apps/tags/__init__.py +++ b/apps/tags/__init__.py @@ -16,6 +16,7 @@ PERMISSION_TAG_ATTACH = {'namespace': 'tags', 'name': 'tag_attach', 'label': _(u PERMISSION_TAG_REMOVE = {'namespace': 'tags', 'name': 'tag_remove', 'label': _(u'Remove tags from documents')} PERMISSION_TAG_DELETE = {'namespace': 'tags', 'name': 'tag_delete', 'label': _(u'Delete global tags')} PERMISSION_TAG_EDIT = {'namespace': 'tags', 'name': 'tag_edit', 'label': _(u'Edit global tags')} +PERMISSION_TAG_VIEW = {'namespace': 'tags', 'name': 'tag_view', 'label': _(u'View a document\'s tags')} set_namespace_title('tags', _(u'Tags')) register_permission(PERMISSION_TAG_CREATE) @@ -23,6 +24,7 @@ register_permission(PERMISSION_TAG_ATTACH) register_permission(PERMISSION_TAG_REMOVE) register_permission(PERMISSION_TAG_DELETE) register_permission(PERMISSION_TAG_EDIT) +register_permission(PERMISSION_TAG_VIEW) tag_list = {'text': _(u'tag list'), 'view': 'tag_list', 'famfam': 'tag_blue'} tag_document_remove = {'text': _(u'remove'), 'view': 'tag_remove', 'args': ['object.id', 'document.id'], 'famfam': 'tag_blue_delete', 'permissions': [PERMISSION_TAG_REMOVE]} diff --git a/apps/tags/views.py b/apps/tags/views.py index a175e26e8e..5f1cb3bcb7 100644 --- a/apps/tags/views.py +++ b/apps/tags/views.py @@ -13,7 +13,8 @@ from documents.views import document_list from tags.forms import AddTagForm, TagForm from tags.models import TagProperties from tags import PERMISSION_TAG_CREATE, PERMISSION_TAG_ATTACH, \ - PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT + PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT, \ + PERMISSION_TAG_VIEW from tags import tag_document_remove as tag_document_remove_link from tags import tag_tagged_item_list as tag_tagged_item_list_link @@ -214,7 +215,7 @@ def tag_tagged_item_list(request, tag_id): def document_tags(request, document_id): - #check_permissions(request.user, [PERMISSION_TAG_VIEW]) + check_permissions(request.user, [PERMISSION_TAG_VIEW]) document = get_object_or_404(Document, pk=document_id) return render_to_response('generic_list.html', {