From 19b2412e039342ae8305e2866fe18ade7fed9311 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 3 Jan 2012 04:26:31 -0400 Subject: [PATCH] Move the 'PERMISSION_DOCUMENT_NEW_VERSION' permission from the sources to the documents app --- apps/documents/__init__.py | 4 +++- apps/documents/permissions.py | 1 + apps/sources/__init__.py | 9 +++------ apps/sources/permissions.py | 3 --- apps/sources/views.py | 5 +++-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/apps/documents/__init__.py b/apps/documents/__init__.py index ad95e977d7..0fe9f1aecb 100644 --- a/apps/documents/__init__.py +++ b/apps/documents/__init__.py @@ -25,7 +25,8 @@ from .permissions import (PERMISSION_DOCUMENT_CREATE, PERMISSION_DOCUMENT_TRANSFORM, PERMISSION_DOCUMENT_TOOLS, PERMISSION_DOCUMENT_EDIT, PERMISSION_DOCUMENT_VERSION_REVERT, PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_TYPE_DELETE, - PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_VIEW) + PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_VIEW, + PERMISSION_DOCUMENT_NEW_VERSION) from .literals import (HISTORY_DOCUMENT_CREATED, HISTORY_DOCUMENT_EDITED, HISTORY_DOCUMENT_DELETED) from .conf.settings import ZOOM_MAX_LEVEL @@ -205,6 +206,7 @@ class_permissions(Document, [ PERMISSION_DOCUMENT_DELETE, PERMISSION_DOCUMENT_DOWNLOAD, PERMISSION_DOCUMENT_TRANSFORM, + PERMISSION_DOCUMENT_NEW_VERSION, PERMISSION_DOCUMENT_VERSION_REVERT, PERMISSION_HISTORY_VIEW ]) diff --git a/apps/documents/permissions.py b/apps/documents/permissions.py index 4dc1657570..93d6bda51a 100644 --- a/apps/documents/permissions.py +++ b/apps/documents/permissions.py @@ -15,6 +15,7 @@ PERMISSION_DOCUMENT_DOWNLOAD = Permission.objects.register(document_namespace, ' PERMISSION_DOCUMENT_TRANSFORM = Permission.objects.register(document_namespace, 'document_transform', _(u'Transform documents')) PERMISSION_DOCUMENT_TOOLS = Permission.objects.register(document_namespace, 'document_tools', _(u'Execute document modifying tools')) PERMISSION_DOCUMENT_VERSION_REVERT = Permission.objects.register(document_namespace, 'document_version_revert', _(u'Revert documents to a previous version')) +PERMISSION_DOCUMENT_NEW_VERSION = Permission.objects.register(document_namespace, 'document_new_version', _(u'Create new document versions')) documents_setup_namespace = PermissionNamespace('documents_setup', _(u'Documents setup')) diff --git a/apps/sources/__init__.py b/apps/sources/__init__.py index ecdbe086a5..9fc8b93965 100644 --- a/apps/sources/__init__.py +++ b/apps/sources/__init__.py @@ -8,7 +8,8 @@ from permissions.models import Permission, PermissionNamespace from common.utils import encapsulate from project_setup.api import register_setup from documents.models import Document -from documents.permissions import PERMISSION_DOCUMENT_CREATE +from documents.permissions import (PERMISSION_DOCUMENT_CREATE, + PERMISSION_DOCUMENT_NEW_VERSION) from acls.api import class_permissions from .staging import StagingFile @@ -17,7 +18,7 @@ from .models import (WebForm, StagingFolder, SourceTransformation, from .widgets import staging_file_thumbnail from .permissions import (PERMISSION_SOURCES_SETUP_VIEW, PERMISSION_SOURCES_SETUP_EDIT, PERMISSION_SOURCES_SETUP_DELETE, - PERMISSION_SOURCES_SETUP_CREATE, PERMISSION_DOCUMENT_NEW_VERSION) + PERMISSION_SOURCES_SETUP_CREATE) staging_file_preview = {'text': _(u'preview'), 'class': 'fancybox-noscaling', 'view': 'staging_file_preview', 'args': ['source.source_type', 'source.pk', 'object.id'], 'famfam': 'zoom'} staging_file_delete = {'text': _(u'delete'), 'view': 'staging_file_delete', 'args': ['source.source_type', 'source.pk', 'object.id'], 'famfam': 'delete', 'keep_query': True} @@ -74,7 +75,3 @@ register_model_list_columns(StagingFile, [ ]) register_setup(setup_sources) - -class_permissions(Document, [ - PERMISSION_DOCUMENT_NEW_VERSION -]) diff --git a/apps/sources/permissions.py b/apps/sources/permissions.py index 119a366e11..e5911fe72c 100644 --- a/apps/sources/permissions.py +++ b/apps/sources/permissions.py @@ -9,6 +9,3 @@ PERMISSION_SOURCES_SETUP_VIEW = Permission.objects.register(sources_setup_namesp PERMISSION_SOURCES_SETUP_EDIT = Permission.objects.register(sources_setup_namespace, 'sources_setup_edit', _(u'Edit document sources')) PERMISSION_SOURCES_SETUP_DELETE = Permission.objects.register(sources_setup_namespace, 'sources_setup_delete', _(u'Delete document sources')) PERMISSION_SOURCES_SETUP_CREATE = Permission.objects.register(sources_setup_namespace, 'sources_setup_create', _(u'Create new document sources')) - -sources_namespace = PermissionNamespace('sources', _(u'Sources')) -PERMISSION_DOCUMENT_NEW_VERSION = Permission.objects.register(sources_namespace, 'sources_document_new_version', _(u'Create new document version')) diff --git a/apps/sources/views.py b/apps/sources/views.py index 290c467108..1f98826d2c 100644 --- a/apps/sources/views.py +++ b/apps/sources/views.py @@ -10,7 +10,8 @@ from django.utils.translation import ugettext from django.utils.safestring import mark_safe from django.conf import settings -from documents.permissions import PERMISSION_DOCUMENT_CREATE +from documents.permissions import (PERMISSION_DOCUMENT_CREATE, + PERMISSION_DOCUMENT_NEW_VERSION) from documents.models import DocumentType, Document from documents.conf.settings import THUMBNAIL_SIZE from metadata.api import decode_metadata_from_url, metadata_repr_as_list @@ -32,7 +33,7 @@ from sources.forms import WebFormSetupForm, StagingFolderSetupForm from sources.forms import SourceTransformationForm, SourceTransformationForm_create from .permissions import (PERMISSION_SOURCES_SETUP_VIEW, PERMISSION_SOURCES_SETUP_EDIT, PERMISSION_SOURCES_SETUP_DELETE, - PERMISSION_SOURCES_SETUP_CREATE, PERMISSION_DOCUMENT_NEW_VERSION) + PERMISSION_SOURCES_SETUP_CREATE) def return_function(obj):