diff options
| -rw-r--r-- | ishtar_common/migrations/0010_auto_20170829_1716.py | 40 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 3 |
2 files changed, 42 insertions, 1 deletions
diff --git a/ishtar_common/migrations/0010_auto_20170829_1716.py b/ishtar_common/migrations/0010_auto_20170829_1716.py new file mode 100644 index 000000000..6e7e1a50e --- /dev/null +++ b/ishtar_common/migrations/0010_auto_20170829_1716.py @@ -0,0 +1,40 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2017-08-29 17:16 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0009_auto_20170829_1651'), + ] + + operations = [ + migrations.CreateModel( + name='TargetKeyGroup', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.TextField(unique=True, verbose_name='Name')), + ('all_user_can_use', models.BooleanField(default=False, verbose_name='All user can user it')), + ('all_user_can_modify', models.BooleanField(default=False, verbose_name='All user can modify it')), + ('available', models.BooleanField(default=True, verbose_name='Available')), + ], + options={ + 'verbose_name': 'Importer - Target key group', + 'verbose_name_plural': 'Importer - Target key groups', + }, + ), + migrations.AddField( + model_name='import', + name='associated_group', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.TargetKeyGroup'), + ), + migrations.AddField( + model_name='targetkey', + name='associated_group', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.TargetKeyGroup'), + ), + ] 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) |