Container: sort by index (add index to index)

2 files changed, 33 insertions, 2 deletions

diff --git a/archaeological_warehouse/migrations/0111_auto_20210225_1039.py b/archaeological_warehouse/migrations/0111_auto_20210225_1039.py
new file mode 100644
index 000000000..f68b468f2
--- /dev/null
+++ b/archaeological_warehouse/migrations/0111_auto_20210225_1039.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.27 on 2021-02-25 10:39
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('archaeological_warehouse', '0110_auto_20210209_1610'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='container',
+            options={'ordering': ('location', 'index', 'cached_label'), 'permissions': (('view_container', 'Can view all Containers'), ('view_own_container', 'Can view own Container'), ('add_own_container', 'Can add own Container'), ('change_own_container', 'Can change own Container'), ('delete_own_container', 'Can delete own Container')), 'verbose_name': 'Container', 'verbose_name_plural': 'Containers'},
+        ),
+        migrations.AlterField(
+            model_name='container',
+            name='index',
+            field=models.IntegerField(blank=True, db_index=True, null=True, verbose_name='Container ID'),
+        ),
+        migrations.AlterField(
+            model_name='container',
+            name='responsibility',
+            field=models.ForeignKey(blank=True, help_text='Warehouse that owns the container', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='responsibilities', to='archaeological_warehouse.Warehouse', verbose_name='Responsibility'),
+        ),
+    ]
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index feea9183e..b2fa7853c 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -958,7 +958,8 @@ class Container(DocumentItem, Merge, LightHistorizedItem,
     parent = models.ForeignKey("Container", verbose_name=_("Parent container"),
                                on_delete=models.SET_NULL,
                                related_name="children", blank=True, null=True)
-    index = models.IntegerField(_("Container ID"), blank=True, null=True)
+    index = models.IntegerField(_("Container ID"), blank=True, null=True,
+                                db_index=True)
     old_reference = models.TextField(_("Old reference"), blank=True, default="")
     external_id = models.TextField(_("External ID"), blank=True, default="")
     auto_external_id = models.BooleanField(
@@ -978,7 +979,7 @@ class Container(DocumentItem, Merge, LightHistorizedItem,
     class Meta:
         verbose_name = _("Container")
         verbose_name_plural = _("Containers")
-        ordering = ('cached_label',)
+        ordering = ('location', 'index', 'cached_label',)
         unique_together = [('location', 'container_type', 'parent',
                             'reference')]
         permissions = (