diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-29 17:40:55 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-08-29 17:40:55 +0200 |
| commit | 1d6db022ecb9e3e5310265b9329f56d579fd6978 (patch) | |
| tree | 9f7de06f08c62abd2dd192fb156b91cacb9b5424 /ishtar_common/models_imports.py | |
| parent | cfc90df69fb569f469914865dc478caaab4b8d58 (diff) | |
| download | Ishtar-1d6db022ecb9e3e5310265b9329f56d579fd6978.tar.bz2 Ishtar-1d6db022ecb9e3e5310265b9329f56d579fd6978.zip | |
Import models: can associate a target key group to an import
Diffstat (limited to 'ishtar_common/models_imports.py')
| -rw-r--r-- | ishtar_common/models_imports.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 065dfa4de..852e9fe3a 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -531,7 +531,7 @@ class TargetKey(models.Model): class Meta: unique_together = ('target', 'key', 'associated_user', - 'associated_import', 'associated_group') + 'associated_import',) verbose_name = _(u"Importer - Target key") verbose_name_plural = _(u"Importer - Targets keys") @@ -748,6 +748,7 @@ class Import(models.Model): imported_images = models.FileField( _(u"Associated images (zip file)"), upload_to="upload/imports/%Y/%m/", blank=True, null=True, max_length=220) + associated_group = models.ForeignKey(TargetKeyGroup, blank=True, null=True) encoding = models.CharField(_(u"Encoding"), choices=ENCODINGS, default=u'utf-8', max_length=15) skip_lines = models.IntegerField(_(u"Skip lines"), default=1) |