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

Update document indexing app to the new class based permissions

Browse Source
This commit is contained in:
Roberto Rosario
2011-12-08 16:36:09 -04:00
parent 563a1d176f
commit e5e2117771
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/document_indexing/__init__.py
View File

@@ -2,19 +2,18 @@ from django.utils.translation import ugettext_lazy as _
from navigation.api import register_top_menu, register_sidebar_template, \
register_links
from permissions.api import register_permission, set_namespace_title
from permissions.models import PermissionNamespace, Permission
from main.api import register_maintenance_links
from documents.literals import PERMISSION_DOCUMENT_VIEW
from documents.models import Document
from document_indexing.models import IndexInstance
PERMISSION_DOCUMENT_INDEXING_VIEW = {'namespace': 'document_indexing', 'name': 'document_index_view', 'label': _(u'View document indexes')}
PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES = {'namespace': 'document_indexing', 'name': 'document_rebuild_indexes', 'label': _(u'Rebuild document indexes')}
document_indexing_namespace = PermissionNamespace('document_indexing', _(u'Indexing'))
set_namespace_title('document_indexing', _(u'Indexing'))
register_permission(PERMISSION_DOCUMENT_INDEXING_VIEW)
register_permission(PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES)
PERMISSION_DOCUMENT_INDEXING_VIEW = Permission.objects.register(document_indexing_namespace, 'document_index_view', _(u'View document indexes'))
PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES = Permission.objects.register(document_indexing_namespace, 'document_rebuild_indexes', _(u'Rebuild document indexes'))
index_list = {'text': _(u'index list'), 'view': 'index_instance_list', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW]}
index_parent = {'text': _(u'go up one level'), 'view': 'index_instance_list', 'args': 'object.parent.pk', 'famfam': 'arrow_up', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW], 'dont_mark_active': True}

16
apps/document_indexing/views.py
View File

@@ -5,23 +5,23 @@ from django.template import RequestContext
from django.contrib import messages
from django.utils.safestring import mark_safe
from permissions.api import check_permissions
from permissions.models import Permission
from documents.literals import PERMISSION_DOCUMENT_VIEW
from documents.models import Document
from documents.views import document_list
from common.utils import encapsulate
from document_indexing import PERMISSION_DOCUMENT_INDEXING_VIEW, \
PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES
from document_indexing import (PERMISSION_DOCUMENT_INDEXING_VIEW,
PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES)
from document_indexing.models import IndexInstance
from document_indexing.api import get_breadcrumbs, get_instance_link, \
do_rebuild_all_indexes
from document_indexing.api import (get_breadcrumbs, get_instance_link,
do_rebuild_all_indexes)
from document_indexing.widgets import index_instance_item_link
def index_instance_list(request, index_id=None):
check_permissions(request.user, [PERMISSION_DOCUMENT_INDEXING_VIEW])
Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_INDEXING_VIEW])
if index_id:
index_instance = get_object_or_404(IndexInstance, pk=index_id)
@@ -70,7 +70,7 @@ def index_instance_list(request, index_id=None):
def rebuild_index_instances(request):
check_permissions(request.user, [PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES])
Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES])
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None)))
@@ -97,7 +97,7 @@ def rebuild_index_instances(request):
def document_index_list(request, document_id):
check_permissions(request.user, [PERMISSION_DOCUMENT_VIEW, PERMISSION_DOCUMENT_INDEXING_VIEW])
Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_VIEW, PERMISSION_DOCUMENT_INDEXING_VIEW])
document = get_object_or_404(Document, pk=document_id)
object_list = []