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

Update apps to new ACL app changes

Browse Source
This commit is contained in:
Roberto Rosario
2015-06-30 02:42:46 -04:00
parent c6cdafb12a
commit d45cf5d02e
16 changed files with 37 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mayan/apps/documents/apps.py
View File

@@ -5,7 +5,8 @@ from django.utils.translation import ugettext_lazy as _
from actstream import registry
from acls.api import class_permissions
from acls.permissions import acls_view_acl, acls_edit_acl
from acls.links import link_acl_list
from acls.permissions import permission_acl_edit, permission_acl_view
from common import (
MayanAppConfig, MissingItem, menu_facet, menu_front_page, menu_object,
menu_secondary, menu_setup, menu_sidebar, menu_multi_item
@@ -27,12 +28,11 @@ from statistics.classes import StatisticNamespace
from .handlers import create_default_document_type
from .links import (
link_clear_image_cache, link_document_acl_list,
link_document_clear_transformations, link_document_delete,
link_document_document_type_edit, link_document_events_view,
link_document_multiple_document_type_edit, link_document_download,
link_document_edit, link_document_list, link_document_list_recent,
link_document_multiple_delete,
link_clear_image_cache, link_document_clear_transformations,
link_document_delete, link_document_document_type_edit,
link_document_events_view, link_document_multiple_document_type_edit,
link_document_download, link_document_edit, link_document_list,
link_document_list_recent, link_document_multiple_delete,
link_document_multiple_clear_transformations,
link_document_multiple_download, link_document_multiple_update_page_count,
link_document_page_navigation_first, link_document_page_navigation_last,
@@ -82,10 +82,10 @@ class DocumentsApp(MayanAppConfig):
])
class_permissions(Document, [
acls_view_acl, acls_edit_acl, permission_document_delete,
permission_document_download, permission_document_edit,
permission_document_new_version, permission_document_print,
permission_document_properties_edit,
permission_acl_edit, permission_acl_view,
permission_document_delete, permission_document_download,
permission_document_edit, permission_document_new_version,
permission_document_print, permission_document_properties_edit,
permission_document_version_revert, permission_document_view,
permission_events_view, permission_transformation_create,
permission_transformation_delete, permission_transformation_edit,
@@ -105,7 +105,7 @@ class DocumentsApp(MayanAppConfig):
menu_object.bind_links(links=[link_document_edit, link_document_document_type_edit, link_document_print, link_document_delete, link_document_download, link_document_clear_transformations, link_document_update_page_count], sources=[Document])
# Document facet links
menu_facet.bind_links(links=[link_document_acl_list], sources=[Document])
menu_facet.bind_links(links=[link_acl_list], sources=[Document])
menu_facet.bind_links(links=[link_document_preview], sources=[Document], position=0)
menu_facet.bind_links(links=[link_document_properties], sources=[Document], position=2)
menu_facet.bind_links(links=[link_document_events_view, link_document_version_list], sources=[Document], position=2)

2
mayan/apps/documents/links.py
View File

@@ -2,7 +2,6 @@ from __future__ import absolute_import, unicode_literals
from django.utils.translation import ugettext_lazy as _
from acls.permissions import acls_view_acl
from converter.permissions import permission_transformation_delete
from events.permissions import permission_events_view
from navigation import Link
@@ -39,7 +38,6 @@ def is_min_zoom(context):
# Facet
link_document_acl_list = Link(permissions=[acls_view_acl], text=_('ACLs'), view='documents:document_acl_list', args='object.pk')
link_document_events_view = Link(permissions=[permission_events_view], text=_('Events'), view='events:events_for_object', args=['"documents"', '"document"', 'object.id'])
link_document_preview = Link(permissions=[permission_document_view], text=_('Preview'), view='documents:document_preview', args='object.id')
link_document_properties = Link(permissions=[permission_document_view], text=_('Properties'), view='documents:document_properties', args='object.id')

3
mayan/apps/documents/urls.py
View File

@@ -30,8 +30,6 @@ urlpatterns = patterns(
url(r'^(?P<document_id>\d+)/reset_page_count/$', 'document_update_page_count', name='document_update_page_count'),
url(r'^multiple/reset_page_count/$', 'document_multiple_update_page_count', name='document_multiple_update_page_count'),
url(r'^(?P<document_id>\d+)/acls/$', 'document_acl_list', name='document_acl_list'),
url(r'^(?P<document_id>\d+)/display/$', 'get_document_image', {'size': setting_display_size.value}, 'document_display'),
url(r'^(?P<document_id>\d+)/display/print/$', 'get_document_image', {'size': setting_print_size.value}, 'document_display_print'),
@@ -43,7 +41,6 @@ urlpatterns = patterns(
url(r'^document/version/(?P<document_version_pk>\d+)/download/$', 'document_download', name='document_version_download'),
url(r'^document/version/(?P<document_version_pk>\d+)/revert/$', 'document_version_revert', name='document_version_revert'),
url(r'^(?P<document_id>\d+)/acls/$', 'document_acl_list', name='document_acl_list'),
url(r'^(?P<pk>\d+)/pages/all/$', DocumentPageListView.as_view(), name='document_pages'),
url(r'^multiple/clear_transformations/$', 'document_multiple_clear_transformations', name='document_multiple_clear_transformations'),

13
mayan/apps/documents/views.py
View File

@@ -14,8 +14,6 @@ from django.template import RequestContext
from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _, ungettext
from acls.models import AccessEntry
from acls.views import acl_list_for
from common.compressed_files import CompressedFile
from common.utils import encapsulate, pretty_size
from common.views import ParentChildListView, SingleObjectListView
@@ -1083,14 +1081,3 @@ def document_version_revert(request, document_version_pk):
'title': _('Are you sure you wish to revert to this version?'),
'message': _('All later version after this one will be deleted too.'),
}, context_instance=RequestContext(request))
def document_acl_list(request, document_id):
document = get_object_or_404(Document, pk=document_id)
return acl_list_for(
request,
document,
extra_context={
'object': document,
}
)