From 5f3d6e4ea652a8187a3497a3fc65b1886495d812 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 12 Oct 2015 14:17:09 +0200 Subject: Importers: new field for associated images - fix duplicate columns --- ishtar_common/models.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 991e26060..39a79161e 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1430,6 +1430,8 @@ TARGET_MODELS = [ _(u"Conservatory state")), ('archaeological_finds.models.PreservationType', _(u"Preservation type")), ('archaeological_finds.models.ObjectType', _(u"Object type")), + ('archaeological_context_records.models.IdentificationType', + _("Identification type")) ] TARGET_MODELS_KEYS = [tm[0] for tm in TARGET_MODELS] @@ -1538,6 +1540,9 @@ class Import(models.Model): importer_type = models.ForeignKey(ImporterType) imported_file = models.FileField(_(u"Imported file"), upload_to="upload/imports/") + imported_images = models.FileField( + _(u"Associated images (zip file)"), upload_to="upload/imports/", + blank=True, null=True) encoding = models.CharField(_(u"Encoding"), choices=ENCODINGS, default='utf-8', max_length=15) skip_lines = models.IntegerField(_(u"Skip lines"), default=1) -- cgit v1.2.3