Container: adapt forms for the new container management

1 files changed, 9 insertions, 5 deletions

diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 8d2a3fb71..6de87ee36 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -370,9 +370,9 @@ post_delete.connect(post_save_cache, sender=WarehouseDivision)
 
 
 class WarehouseDivisionLinkManager(models.Manager):
-    def get_by_natural_key(self, warehouse, division):
+    def get_by_natural_key(self, warehouse, container_type):
         return self.get(warehouse__uuid=warehouse,
-                        division__txt_idx=division)
+                        container_type__txt_idx=container_type)
 
 
 class ContainerType(GeneralType):
@@ -386,11 +386,12 @@ class ContainerType(GeneralType):
     volume = models.FloatField(_("Volume (l)"), blank=True, null=True)
     reference = models.CharField(_("Ref."), max_length=300, blank=True,
                                  null=True)
+    order = models.IntegerField(_("Order"), default=10)
 
     class Meta:
         verbose_name = _("Container type")
         verbose_name_plural = _("Container types")
-        ordering = ('label',)
+        ordering = ('order', 'label',)
 
 
 post_save.connect(post_save_cache, sender=ContainerType)
@@ -414,10 +415,10 @@ class WarehouseDivisionLink(models.Model):
         unique_together = ('warehouse', 'division')
 
     def __str__(self):
-        return "{} - {}".format(self.warehouse, self.division)
+        return "{} - {}".format(self.warehouse, self.container_type)
 
     def natural_key(self):
-        return self.warehouse.uuid, self.division.txt_idx
+        return self.warehouse.uuid, self.container_type.txt_idx
 
 
 class ContainerTree:
@@ -1123,6 +1124,7 @@ def container_post_save(sender, **kwargs):
     if not kwargs.get('instance'):
         return
     instance = kwargs.get('instance')
+    #TODO: to be deleted???
     for loca in ContainerLocalisation.objects.filter(
             container=instance).exclude(
             division__warehouse=instance.location).all():
@@ -1142,6 +1144,7 @@ m2m_changed.connect(document_attached_changed,
 
 
 class ContainerLocalisationManager(models.Manager):
+    #TODO: to be deleted....
     def get_by_natural_key(self, container, warehouse, division):
         return self.get(container__uuid=container,
                         division__warehouse__uuid=warehouse,
@@ -1149,6 +1152,7 @@ class ContainerLocalisationManager(models.Manager):
 
 
 class ContainerLocalisation(models.Model):
+    #TODO: to be deleted....
     container = models.ForeignKey(Container, verbose_name=_("Container"),
                                   related_name='division')
     division = models.ForeignKey(WarehouseDivisionLink,