diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 17:27:31 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-02 17:27:31 +0100 |
| commit | c8dd8eba4546961fa154c0ae386709750fcfffb4 (patch) | |
| tree | 613ea46830ed40c5b9b031ba54664f05cfe98b75 /ishtar_common/models.py | |
| parent | c1e94dc1b8851b61bc8d697e08f8a407b5269365 (diff) | |
| parent | 219a775ed06ba6e75b2a9a04af406aea3ef579bb (diff) | |
| download | Ishtar-c8dd8eba4546961fa154c0ae386709750fcfffb4.tar.bz2 Ishtar-c8dd8eba4546961fa154c0ae386709750fcfffb4.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 572bd85e7..723125149 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2124,12 +2124,14 @@ TARGET_MODELS = [ ('archaeological_finds.models.ObjectType', _(u"Object type")), ('archaeological_finds.models.IntegrityType', _(u"Integrity type")), ('archaeological_finds.models.RemarkabilityType', _(u"Remarkability type")), + ('archaeological_finds.models.BatchType', _(u"Batch type")), ('archaeological_context_records.models.IdentificationType', _("Identification type")), ('archaeological_context_records.models.RelationType', _(u"Context record relation type")), ('SpatialReferenceSystem', _(u"Spatial reference system")), ('SupportType', _(u"Support type")), + ('TitleType', _(u"Title type")), ] TARGET_MODELS_KEYS = [tm[0] for tm in TARGET_MODELS] @@ -2246,23 +2248,23 @@ ENCODINGS = [(settings.ENCODING, settings.ENCODING), class Import(models.Model): user = models.ForeignKey('IshtarUser') importer_type = models.ForeignKey(ImporterType) - imported_file = models.FileField(_(u"Imported file"), - upload_to="upload/imports/") + imported_file = models.FileField( + _(u"Imported file"), upload_to="upload/imports/", max_length=220) imported_images = models.FileField( _(u"Associated images (zip file)"), upload_to="upload/imports/", - blank=True, null=True) + blank=True, null=True, max_length=220) encoding = models.CharField(_(u"Encoding"), choices=ENCODINGS, default='utf-8', max_length=15) skip_lines = models.IntegerField(_(u"Skip lines"), default=1) error_file = models.FileField(_(u"Error file"), upload_to="upload/imports/", - blank=True, null=True) + blank=True, null=True, max_length=255) result_file = models.FileField(_(u"Result file"), upload_to="upload/imports/", - blank=True, null=True) + blank=True, null=True, max_length=255) match_file = models.FileField(_(u"Match file"), upload_to="upload/imports/", - blank=True, null=True) + blank=True, null=True, max_length=255) state = models.CharField(_(u"State"), max_length=2, choices=IMPORT_STATE, default='C') conservative_import = models.BooleanField( |