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

Use metadata model's related name to address a document's metadata instances

Browse Source
This commit is contained in:
Roberto Rosario
2014-06-25 03:01:27 -04:00
parent ac061f2203
commit 5e3d5c7fcb
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mayan/apps/document_indexing/api.py
View File

@@ -30,7 +30,7 @@ def update_indexes(document):
warnings = []
eval_dict = {}
document_metadata_dict = dict([(metadata.metadata_type.name, metadata.value) for metadata in document.documentmetadata_set.all() if metadata.value])
document_metadata_dict = dict([(metadata.metadata_type.name, metadata.value) for metadata in document.metadata.all() if metadata.value])
eval_dict['document'] = document
eval_dict['metadata'] = MetadataClass(document_metadata_dict)

2
mayan/apps/linking/managers.py
View File

@@ -14,7 +14,7 @@ class SmartLinkManager(models.Manager):
errors = []
result = {}
metadata_dict = {}
for document_metadata in document.documentmetadata_set.all():
for document_metadata in document.metadata.all():
metadata_dict[document_metadata.metadata_type.name] = document_metadata.value
eval_dict = {}
eval_dict['document'] = document

2
mayan/apps/metadata/models.py
View File

@@ -82,7 +82,7 @@ class DocumentMetadata(models.Model):
Link a document to a specific instance of a metadata type with it's
current value
"""
document = models.ForeignKey(Document, verbose_name=_(u'document'))
document = models.ForeignKey(Document, verbose_name=_(u'document'), related_name='metadata')
metadata_type = models.ForeignKey(MetadataType, verbose_name=_(u'type'))
value = models.CharField(max_length=255, blank=True, verbose_name=_(u'value'), db_index=True)

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

@@ -35,7 +35,7 @@ from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT,
def metadata_edit(request, document_id=None, document_id_list=None):
if document_id:
documents = [get_object_or_404(Document, pk=document_id)]
if documents[0].documentmetadata_set.count() == 0:
if documents[0].metadata.count() == 0:
messages.warning(request, _(u'The selected document doesn\'t have any metadata.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
elif document_id_list:
@@ -58,7 +58,7 @@ def metadata_edit(request, document_id=None, document_id_list=None):
for document in documents:
RecentDocument.objects.add_document_for_user(request.user, document)
for item in document.documentmetadata_set.all():
for item in document.metadata.all():
value = item.value
if item.metadata_type in metadata:
if value not in metadata[item.metadata_type]:
@@ -186,7 +186,7 @@ def metadata_multiple_add(request):
def metadata_remove(request, document_id=None, document_id_list=None):
if document_id:
documents = [get_object_or_404(Document, pk=document_id)]
if documents[0].documentmetadata_set.count() == 0:
if documents[0].metadata.count() == 0:
messages.warning(request, _(u'The selected document doesn\'t have any metadata.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
@@ -210,7 +210,7 @@ def metadata_remove(request, document_id=None, document_id_list=None):
for document in documents:
RecentDocument.objects.add_document_for_user(request.user, document)
for item in document.documentmetadata_set.all():
for item in document.metadata.all():
value = item.value
if item.metadata_type in metadata:
if value not in metadata[item.metadata_type]:
@@ -274,7 +274,7 @@ def metadata_view(request, document_id):
return render_to_response('generic_list.html', {
'title': _(u'metadata for: %s') % document,
'object_list': document.documentmetadata_set.all(),
'object_list': document.metadata.all(),
'extra_columns': [{'name': _(u'value'), 'attribute': 'value'}],
'hide_link': True,
'object': document,

2
mayan/apps/sources/views.py
View File

@@ -53,7 +53,7 @@ def document_create_siblings(request, document_id):
document = get_object_or_404(Document, pk=document_id)
query_dict = {}
for pk, metadata in enumerate(document.documentmetadata_set.all()):
for pk, metadata in enumerate(document.metadata.all()):
query_dict['metadata%s_id' % pk] = metadata.metadata_type_id
query_dict['metadata%s_value' % pk] = metadata.value