From e57080b06db02eebc60297ca327882f77482b4b6 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 19 Oct 2015 01:21:43 -0400 Subject: [PATCH] Style updates. --- mayan/apps/metadata/models.py | 37 ++++++++++++++++++----------------- mayan/apps/tags/models.py | 8 ++++---- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/mayan/apps/metadata/models.py b/mayan/apps/metadata/models.py index 533fb2cfa5..d9b7d249bf 100644 --- a/mayan/apps/metadata/models.py +++ b/mayan/apps/metadata/models.py @@ -36,14 +36,6 @@ class MetadataType(models.Model): Define a type of metadata """ - @staticmethod - def comma_splitter(string): - splitter = shlex.shlex(string.encode('utf-8'), posix=True) - splitter.whitespace = ','.encode('utf-8') - splitter.whitespace_split = True - splitter.commenters = ''.encode('utf-8') - return list(splitter) - name = models.CharField( max_length=48, help_text=_( @@ -94,6 +86,19 @@ class MetadataType(models.Model): def natural_key(self): return (self.name,) + class Meta: + ordering = ('label',) + verbose_name = _('Metadata type') + verbose_name_plural = _('Metadata types') + + @staticmethod + def comma_splitter(string): + splitter = shlex.shlex(string.encode('utf-8'), posix=True) + splitter.whitespace = ','.encode('utf-8') + splitter.whitespace_split = True + splitter.commenters = ''.encode('utf-8') + return list(splitter) + def get_default_value(self): template = Template(self.default) context = Context() @@ -134,11 +139,6 @@ class MetadataType(models.Model): return value - class Meta: - ordering = ('label',) - verbose_name = _('Metadata type') - verbose_name_plural = _('Metadata types') - @python_2_unicode_compatible class DocumentMetadata(models.Model): @@ -146,6 +146,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, related_name='metadata', verbose_name=_('Document') ) @@ -181,17 +182,17 @@ class DocumentMetadata(models.Model): document_type=self.document.document_type, value=self.value ) + class Meta: + unique_together = ('document', 'metadata_type') + verbose_name = _('Document metadata') + verbose_name_plural = _('Document metadata') + @property def is_required(self): return self.metadata_type.get_required_for( document_type=self.document.document_type ) - class Meta: - unique_together = ('document', 'metadata_type') - verbose_name = _('Document metadata') - verbose_name_plural = _('Document metadata') - @python_2_unicode_compatible class DocumentTypeMetadataType(models.Model): diff --git a/mayan/apps/tags/models.py b/mayan/apps/tags/models.py index 163ce9171b..941654ffca 100644 --- a/mayan/apps/tags/models.py +++ b/mayan/apps/tags/models.py @@ -24,16 +24,16 @@ class Tag(models.Model): Document, related_name='tags', verbose_name=_('Documents') ) - class Meta: - verbose_name = _('Tag') - verbose_name_plural = _('Tags') - def __str__(self): return self.label def get_absolute_url(self): return reverse('tags:tag_tagged_item_list', args=(str(self.pk),)) + class Meta: + verbose_name = _('Tag') + verbose_name_plural = _('Tags') + def get_document_count(self, user): queryset = self.documents