Move the 'PERMISSION_DOCUMENT_NEW_VERSION' permission from the sources to the documents app
This commit is contained in:
@@ -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
|
||||
])
|
||||
|
||||
@@ -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'))
|
||||
|
||||
@@ -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):
|
||||
|
||||
Reference in New Issue
Block a user