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

Convert document type optional and required metadata views to CBV assign remove view

Browse Source
This commit is contained in:
Roberto Rosario
2015-04-07 03:22:48 -04:00
parent d79ab07337
commit a522292ee4
2 changed files with 47 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mayan/apps/metadata/urls.py
View File

@@ -9,7 +9,11 @@ from .api_views import (
APIDocumentTypeMetadataTypeRequiredView, APIMetadataTypeListView,
APIMetadataTypeView
)
from .views import MissingRequiredMetadataDocumentListView
from .views import (
MissingRequiredMetadataDocumentListView,
SetupDocumentTypeMetadataOptionalView,
SetupDocumentTypeMetadataRequiredView
)
urlpatterns = patterns('metadata.views',
url(r'^(?P<document_id>\d+)/edit/$', 'metadata_edit', (), 'metadata_edit'),
@@ -25,8 +29,8 @@ urlpatterns = patterns('metadata.views',
url(r'^setup/type/(?P<metadatatype_id>\d+)/edit/$', 'setup_metadata_type_edit', (), 'setup_metadata_type_edit'),
url(r'^setup/type/(?P<metadatatype_id>\d+)/delete/$', 'setup_metadata_type_delete', (), 'setup_metadata_type_delete'),
url(r'^setup/document/type/(?P<document_type_id>\d+)/metadata/edit/$', 'setup_document_type_metadata', (), 'setup_document_type_metadata'),
url(r'^setup/document/type/(?P<document_type_id>\d+)/metadata/edit/required/$', 'setup_document_type_metadata_required', (), 'setup_document_type_metadata_required'),
url(r'^setup/document/type/(?P<document_type_id>\d+)/metadata/edit/$', SetupDocumentTypeMetadataOptionalView.as_view(), name='setup_document_type_metadata'),
url(r'^setup/document/type/(?P<document_type_id>\d+)/metadata/edit/required/$', SetupDocumentTypeMetadataRequiredView.as_view(), name='setup_document_type_metadata_required'),
url(r'^tools/missing_required_metadata/$', MissingRequiredMetadataDocumentListView.as_view(), name='documents_missing_required_metadata'),
)

71
mayan/apps/metadata/views.py
View File

@@ -19,7 +19,7 @@ from documents.views import DocumentListView
from permissions.models import Permission
from common.utils import encapsulate, generate_choices_w_labels
from common.views import assign_remove
from common.views import AssignRemoveView
from .api import save_metadata_list
from .forms import (
@@ -441,41 +441,50 @@ def setup_metadata_type_delete(request, metadatatype_id):
context_instance=RequestContext(request))
def setup_document_type_metadata(request, document_type_id):
Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_TYPE_EDIT])
class SetupDocumentTypeMetadataOptionalView(AssignRemoveView):
decode_content_type = True
document_type = get_object_or_404(DocumentType, pk=document_type_id)
def add(self, item):
self.document_type.metadata.create(metadata_type=item, required=False)
return assign_remove(
request,
left_list=lambda: generate_choices_w_labels(set(MetadataType.objects.all()) - set(MetadataType.objects.filter(id__in=document_type.metadata.values_list('metadata_type', flat=True))), display_object_type=False),
right_list=lambda: generate_choices_w_labels(document_type.metadata.filter(required=False), display_object_type=False),
add_method=lambda x: document_type.metadata.create(metadata_type=x, required=False),
remove_method=lambda x: x.delete(),
extra_context={
'document_type': document_type,
'main_title': _('Optional metadata types for document type: %s') % document_type,
def dispatch(self, request, *args, **kwargs):
Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_TYPE_EDIT])
self.document_type = get_object_or_404(DocumentType, pk=self.kwargs['document_type_id'])
return super(SetupDocumentTypeMetadataOptionalView, self).dispatch(request, *args, **kwargs)
def left_list(self):
return generate_choices_w_labels(set(MetadataType.objects.all()) - set(MetadataType.objects.filter(id__in=self.document_type.metadata.values_list('metadata_type', flat=True))), display_object_type=False)
def right_list(self):
return generate_choices_w_labels(self.document_type.metadata.filter(required=False), display_object_type=False)
def remove(self, item):
item.delete()
def get_context_data(self, **kwargs):
data = super(SetupDocumentTypeMetadataOptionalView, self).get_context_data(**kwargs)
data.update({
'document_type': self.document_type,
'main_title': _('Optional metadata types for document type: %s') % self.document_type,
'navigation_object_list': ['document_type'],
},
decode_content_type=True,
)
})
return data
def setup_document_type_metadata_required(request, document_type_id):
Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_TYPE_EDIT])
class SetupDocumentTypeMetadataRequiredView(SetupDocumentTypeMetadataOptionalView):
def add(self, item):
self.document_type.metadata.create(metadata_type=item, required=True)
document_type = get_object_or_404(DocumentType, pk=document_type_id)
def right_list(self):
return generate_choices_w_labels(self.document_type.metadata.filter(required=True), display_object_type=False)
return assign_remove(
request,
left_list=lambda: generate_choices_w_labels(set(MetadataType.objects.all()) - set(MetadataType.objects.filter(id__in=document_type.metadata.values_list('metadata_type', flat=True))), display_object_type=False),
right_list=lambda: generate_choices_w_labels(document_type.metadata.filter(required=True), display_object_type=False),
add_method=lambda x: document_type.metadata.create(metadata_type=x, required=True),
remove_method=lambda x: x.delete(),
extra_context={
'document_type': document_type,
'main_title': _('Required metadata types for document type: %s') % document_type,
def get_context_data(self, **kwargs):
data = super(SetupDocumentTypeMetadataRequiredView, self).get_context_data(**kwargs)
data.update({
'document_type': self.document_type,
'main_title': _('Required metadata types for document type: %s') % self.document_type,
'navigation_object_list': ['document_type'],
},
decode_content_type=True,
)
})
return data