Merge branch 'master' into v0.9

Conflicts:
	Makefile.example
	archaeological_operations/migrations/0061_regenerate_cached_label.py
	archaeological_warehouse/migrations/0024_generate_cache_lbl_for_containers.py

1 files changed, 7 insertions, 6 deletions

diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index 81660bf43..d1918f46a 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
+# Copyright (C) 2012-2017 Étienne Loks  <etienne.loks_AT_peacefrogsDOTnet>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -28,7 +28,7 @@ from django.utils.translation import ugettext_lazy as _, ugettext
 from ishtar_common.utils import cached_label_changed
 
 from ishtar_common.models import GeneralType, get_external_id, \
-    LightHistorizedItem, OwnPerms, Address, Person, post_save_cache
+    LightHistorizedItem, OwnPerms, Address, Person, post_save_cache, ImageModel
 
 
 class WarehouseType(GeneralType):
@@ -114,8 +114,8 @@ class Collection(LightHistorizedItem):
 
 class WarehouseDivision(GeneralType):
     class Meta:
-        verbose_name = _(u"Warehouse division")
-        verbose_name_plural = _(u"Warehouse divisions")
+        verbose_name = _(u"Warehouse division type")
+        verbose_name_plural = _(u"Warehouse division types")
 post_save.connect(post_save_cache, sender=WarehouseDivision)
 post_delete.connect(post_save_cache, sender=WarehouseDivision)
 
@@ -149,9 +149,10 @@ post_save.connect(post_save_cache, sender=ContainerType)
 post_delete.connect(post_save_cache, sender=ContainerType)
 
 
-class Container(LightHistorizedItem):
+class Container(LightHistorizedItem, ImageModel):
     TABLE_COLS = ['reference', 'container_type__label', 'cached_location',
                   'divisions_lbl']
+    IMAGE_PREFIX = 'containers/'
 
     # search parameters
     EXTRA_REQUEST_KEYS = {
@@ -182,7 +183,7 @@ class Container(LightHistorizedItem):
                                     null=True, blank=True)
     cached_location = models.CharField(_(u"Cached location"), max_length=500,
                                        null=True, blank=True)
-    index = models.IntegerField(u"Index", default=0)
+    index = models.IntegerField(u"ID", default=0)
     external_id = models.TextField(_(u"External ID"), blank=True, null=True)
     auto_external_id = models.BooleanField(
         _(u"External ID is set automatically"), default=False)