From 61cb9ac52470cf9b7d5ab37282c6b6ef1728d04a Mon Sep 17 00:00:00 2001 From: Michael Price Date: Sat, 10 Mar 2018 13:18:55 -0400 Subject: [PATCH] Silence UnorderedObjectListWarning warnings. Signed-off-by: Michael Price --- .../migrations/0002_auto_20180310_1715.py | 19 +++++++++++++++++++ .../migrations/0007_auto_20180310_1715.py | 19 +++++++++++++++++++ .../migrations/0010_auto_20180310_1717.py | 19 +++++++++++++++++++ mayan/apps/document_states/models.py | 1 + .../migrations/0008_auto_20180310_1715.py | 19 +++++++++++++++++++ mayan/apps/metadata/models.py | 12 +++++++----- 6 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 mayan/apps/acls/migrations/0002_auto_20180310_1715.py create mode 100644 mayan/apps/checkouts/migrations/0007_auto_20180310_1715.py create mode 100644 mayan/apps/document_states/migrations/0010_auto_20180310_1717.py create mode 100644 mayan/apps/metadata/migrations/0008_auto_20180310_1715.py diff --git a/mayan/apps/acls/migrations/0002_auto_20180310_1715.py b/mayan/apps/acls/migrations/0002_auto_20180310_1715.py new file mode 100644 index 0000000000..298c21a34f --- /dev/null +++ b/mayan/apps/acls/migrations/0002_auto_20180310_1715.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-10 17:15 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('acls', '0001_squashed_0002_auto_20150703_0513'), + ] + + operations = [ + migrations.AlterModelOptions( + name='accesscontrollist', + options={'ordering': ('pk',), 'verbose_name': 'Access entry', 'verbose_name_plural': 'Access entries'}, + ), + ] diff --git a/mayan/apps/checkouts/migrations/0007_auto_20180310_1715.py b/mayan/apps/checkouts/migrations/0007_auto_20180310_1715.py new file mode 100644 index 0000000000..0edb58e116 --- /dev/null +++ b/mayan/apps/checkouts/migrations/0007_auto_20180310_1715.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-10 17:15 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('checkouts', '0006_newversionblock'), + ] + + operations = [ + migrations.AlterModelOptions( + name='documentcheckout', + options={'ordering': ('pk',), 'verbose_name': 'Document checkout', 'verbose_name_plural': 'Document checkouts'}, + ), + ] diff --git a/mayan/apps/document_states/migrations/0010_auto_20180310_1717.py b/mayan/apps/document_states/migrations/0010_auto_20180310_1717.py new file mode 100644 index 0000000000..a73d4590b9 --- /dev/null +++ b/mayan/apps/document_states/migrations/0010_auto_20180310_1717.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-10 17:17 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('document_states', '0009_auto_20170807_0612'), + ] + + operations = [ + migrations.AlterModelOptions( + name='workflowinstancelogentry', + options={'ordering': ('datetime',), 'verbose_name': 'Workflow instance log entry', 'verbose_name_plural': 'Workflow instance log entries'}, + ), + ] diff --git a/mayan/apps/document_states/models.py b/mayan/apps/document_states/models.py index 7b2a1eb53c..0634a2b062 100644 --- a/mayan/apps/document_states/models.py +++ b/mayan/apps/document_states/models.py @@ -455,6 +455,7 @@ class WorkflowInstanceLogEntry(models.Model): return force_text(self.transition) class Meta: + ordering = ('datetime',) verbose_name = _('Workflow instance log entry') verbose_name_plural = _('Workflow instance log entries') diff --git a/mayan/apps/metadata/migrations/0008_auto_20180310_1715.py b/mayan/apps/metadata/migrations/0008_auto_20180310_1715.py new file mode 100644 index 0000000000..bd793bfc3e --- /dev/null +++ b/mayan/apps/metadata/migrations/0008_auto_20180310_1715.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-03-10 17:15 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('metadata', '0007_auto_20150918_0800'), + ] + + operations = [ + migrations.AlterModelOptions( + name='documentmetadata', + options={'ordering': ('metadata_type',), 'verbose_name': 'Document metadata', 'verbose_name_plural': 'Document metadata'}, + ), + ] diff --git a/mayan/apps/metadata/models.py b/mayan/apps/metadata/models.py index b58b4dcd9f..0f15d3d9f1 100644 --- a/mayan/apps/metadata/models.py +++ b/mayan/apps/metadata/models.py @@ -162,6 +162,12 @@ class DocumentMetadata(models.Model): verbose_name=_('Value') ) + class Meta: + ordering = ('metadata_type',) + unique_together = ('document', 'metadata_type') + verbose_name = _('Document metadata') + verbose_name_plural = _('Document metadata') + def __str__(self): return force_text(self.metadata_type) @@ -193,11 +199,6 @@ 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( @@ -223,6 +224,7 @@ class DocumentTypeMetadataType(models.Model): return force_text(self.metadata_type) class Meta: + ordering = ('metadata_type',) unique_together = ('document_type', 'metadata_type') verbose_name = _('Document type metadata type options') verbose_name_plural = _('Document type metadata types options')