From: Guillaume Pellerin Date: Thu, 15 Jan 2015 09:54:05 +0000 (+0100) Subject: add item identifier X-Git-Tag: 1.5.0rc6~13 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a9f4b0957b27e1942b1caea694e217721acc68db;p=telemeta.git add item identifier --- diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 634376c0..bdf368fa 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -381,13 +381,24 @@ class MediaCollection(MediaResource): kwargs={'public_id': self.public_id, 'media_id': media.id})) i += 1 - i = 0 - for indentifier in self.identifiers.all(): - metadata['identifier' + '_' + str(i)] = identifier.identifier - metadata['identifier_type' + '_' + str(i)] = identifier.type - metadata['identifier_date_last' + '_' + str(i)] = unicode(identifier.date_last) - metadata['identifier_notes' + '_' + str(i)] = identifier.notes - i += 1 + # One ID only + identifiers = self.identifiers.all() + if identifiers: + identifier = identifiers[0] + metadata['identifier_id'] = identifier.identifier + metadata['identifier_type'] = identifier.type + metadata['identifier_date'] = unicode(identifier.date_last) + metadata['identifier_note'] = identifier.notes + + # All IDs + # i = 0 + # for indentifier in self.identifiers.all(): + # metadata['identifier' + '_' + str(i)] = identifier.identifier + # metadata['identifier_type' + '_' + str(i)] = identifier.type + # metadata['identifier_date_last' + '_' + str(i)] = unicode(identifier.date_last) + # metadata['identifier_notes' + '_' + str(i)] = identifier.notes + # i += 1 + return metadata @@ -639,6 +650,16 @@ class MediaItem(MediaResource): 'grapher_id': 'waveform_spectral', 'width': 346, 'height': 130})) + + # One ID only + identifiers = self.identifiers.all() + if identifiers: + identifier = identifiers[0] + metadata['identifier_id'] = identifier.identifier + metadata['identifier_type'] = identifier.type + metadata['identifier_date'] = unicode(identifier.date_last) + metadata['identifier_note'] = identifier.notes + return metadata @@ -1007,6 +1028,7 @@ class Identifier(ModelCore): class Meta(MetaCore): abstract = True + ordering = ['-date_last'] class MediaItemIdentifier(Identifier):