diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/migrations/0027_auto_20180205_1726.py | 21 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 4 | 
2 files changed, 24 insertions, 1 deletions
diff --git a/ishtar_common/migrations/0027_auto_20180205_1726.py b/ishtar_common/migrations/0027_auto_20180205_1726.py new file mode 100644 index 000000000..bb05d2595 --- /dev/null +++ b/ishtar_common/migrations/0027_auto_20180205_1726.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-02-05 17:26 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + +    dependencies = [ +        ('ishtar_common', '0026_auto_20180119_1516'), +    ] + +    operations = [ +        migrations.AlterField( +            model_name='import', +            name='user', +            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='ishtar_common.IshtarUser'), +        ), +    ] diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 012472b8d..cd868cc4a 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -739,6 +739,7 @@ class FormaterType(models.Model):          else:              return IMPORTER_TYPES_DCT[self.formater_type](**kwargs) +  IMPORT_STATE = (("C", _(u"Created")),                  ("AP", _(u"Analyse in progress")),                  ("A", _(u"Analysed")), @@ -756,7 +757,8 @@ ENCODINGS = [(settings.ENCODING, settings.ENCODING),  class Import(models.Model): -    user = models.ForeignKey('IshtarUser') +    user = models.ForeignKey('IshtarUser', blank=True, null=True, +                             on_delete=models.SET_NULL)      name = models.CharField(_(u"Name"), max_length=500, null=True)      importer_type = models.ForeignKey(ImporterType)      imported_file = models.FileField(  | 
