diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-10-12 14:17:09 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-10-12 14:17:09 +0200 |
| commit | 5f3d6e4ea652a8187a3497a3fc65b1886495d812 (patch) | |
| tree | 9c40019e2cd43deeff03c636d95c68d791c7e01c /ishtar_common/models.py | |
| parent | 1567f54d3fcea10ca73f65afc73d8eee95a2dcfd (diff) | |
| download | Ishtar-5f3d6e4ea652a8187a3497a3fc65b1886495d812.tar.bz2 Ishtar-5f3d6e4ea652a8187a3497a3fc65b1886495d812.zip | |
Importers: new field for associated images - fix duplicate columns
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 5 |
1 files changed, 5 insertions, 0 deletions
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) |