New container localisation - adapt sheets, imports

5 files changed, 19 insertions, 7 deletions

diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json
index 5ae394040..374b5ccbc 100644
--- a/ishtar_common/fixtures/initial_importtypes-fr.json
+++ b/ishtar_common/fixtures/initial_importtypes-fr.json
@@ -133,6 +133,13 @@
     }
 },
 {
+    "model": "ishtar_common.importermodel",
+    "fields": {
+        "name": "Contenant",
+        "klass": "archaeological_warehouse.models.Container"
+    }
+},
+{
     "model": "ishtar_common.documenttemplate",
     "fields": {
         "name": "Document de r\u00e9f\u00e9rence",
diff --git a/ishtar_common/templatetags/link_to_window.py b/ishtar_common/templatetags/link_to_window.py
index 6f0db9dc1..77d743ea0 100644
--- a/ishtar_common/templatetags/link_to_window.py
+++ b/ishtar_common/templatetags/link_to_window.py
@@ -33,9 +33,9 @@ def link_to_window(item, context):
     elif "request" in context:  # RequestContext
         request = context['request']
     else:
-        return u""
+        return ""
     if not item.can_view(request):
-        return u""
+        return ""
     return simple_link_to_window(item)
 
 
diff --git a/ishtar_common/templatetags/window_field.py b/ishtar_common/templatetags/window_field.py
index 7aaf62397..cd4122b58 100644
--- a/ishtar_common/templatetags/window_field.py
+++ b/ishtar_common/templatetags/window_field.py
@@ -161,9 +161,10 @@ def field_li_detail(context, caption, item):
 
 @register.inclusion_tag('ishtar/blocks/window_field_flex_detail.html',
                         takes_context=True)
-def field_flex_detail(context, caption, item, small=False):
-    size = None
-    if small:
+def field_flex_detail(context, caption, item, size=None):
+    if size == "large":
+        size = "full"
+    elif size:
         size = 2
     return field_detail(context, caption, item, size=size)
 
diff --git a/ishtar_common/templatetags/window_tables.py b/ishtar_common/templatetags/window_tables.py
index ab60f7eeb..078afca62 100644
--- a/ishtar_common/templatetags/window_tables.py
+++ b/ishtar_common/templatetags/window_tables.py
@@ -19,7 +19,8 @@ from archaeological_operations.models import Operation, ArchaeologicalSite, \
 from archaeological_context_records.models import ContextRecord, \
     RecordRelationView, RecordRelations as CRRecordRelations
 from archaeological_finds.models import Find, FindUpstreamTreatments, \
-    FindDownstreamTreatments, FindTreatments, TreatmentFile, Treatment
+    FindDownstreamTreatments, FindTreatments, TreatmentFile, Treatment, \
+    FindInsideContainer
 from archaeological_warehouse.models import Container, Warehouse
 
 register = template.Library()
@@ -55,6 +56,8 @@ ASSOCIATED_MODELS['finds_upstreamtreatments'] = (
     FindUpstreamTreatments, 'get-upstreamtreatment', '')
 ASSOCIATED_MODELS['finds_downstreamtreatments'] = (
     FindDownstreamTreatments, 'get-downstreamtreatment', '')
+ASSOCIATED_MODELS['finds_inside_container'] = (
+    FindInsideContainer, 'get-find-inside-container', '')
 ASSOCIATED_MODELS['treatments'] = (
     FindTreatments, 'get-treatment', '')
 ASSOCIATED_MODELS['base_treatments'] = (
diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py
index 2eacce013..f18544ea9 100644
--- a/ishtar_common/utils.py
+++ b/ishtar_common/utils.py
@@ -740,7 +740,8 @@ def _post_save_geo(sender, **kwargs):
         current_source = str(instance.__class__._meta.verbose_name)
 
     modified = False
-    if hasattr(instance, 'multi_polygon'):
+    if hasattr(instance, 'multi_polygon') and not getattr(
+            instance, "DISABLE_POLYGONS", False):
         if instance.multi_polygon_source_item and \
                 instance.multi_polygon_source_item != current_source:  # refetch
             instance.multi_polygon = None