From c80d0b8b3571b1055951ee8e387ec6ee56d5c55b Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 23 May 2018 17:13:35 +0200 Subject: Wizards - JSON fields: Manage field display in forms - management in wizards save and form init (refs #4089) --- .../migrations/0053_auto_20180523_1126.py | 43 --------------------- .../migrations/0053_auto_20180523_1504.py | 45 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 43 deletions(-) delete mode 100644 ishtar_common/migrations/0053_auto_20180523_1126.py create mode 100644 ishtar_common/migrations/0053_auto_20180523_1504.py (limited to 'ishtar_common/migrations') diff --git a/ishtar_common/migrations/0053_auto_20180523_1126.py b/ishtar_common/migrations/0053_auto_20180523_1126.py deleted file mode 100644 index f776dce30..000000000 --- a/ishtar_common/migrations/0053_auto_20180523_1126.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-05-23 11:26 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0052_m2m_images_migrate_imports'), - ] - - operations = [ - migrations.CreateModel( - name='CustomFormJsonField', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('order', models.IntegerField(default=1, verbose_name='Order')), - ('custom_form', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='json_fields', to='ishtar_common.CustomForm')), - ], - options={ - 'verbose_name': 'Custom form - Json data field', - 'verbose_name_plural': 'Custom form - Json data fields', - }, - ), - migrations.AddField( - model_name='jsondatafield', - name='value_type', - field=models.CharField(choices=[(b'T', 'Text'), (b'LT', 'Long text'), (b'I', 'Integer'), (b'F', 'Float'), (b'D', 'Date'), (b'C', 'Choices')], default=b'T', max_length=10, verbose_name='Type'), - ), - migrations.AddField( - model_name='customformjsonfield', - name='json_field', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='custom_form_details', to='ishtar_common.JsonDataField'), - ), - migrations.AddField( - model_name='jsondatafield', - name='custom_forms', - field=models.ManyToManyField(blank=True, through='ishtar_common.CustomFormJsonField', to='ishtar_common.CustomForm'), - ), - ] diff --git a/ishtar_common/migrations/0053_auto_20180523_1504.py b/ishtar_common/migrations/0053_auto_20180523_1504.py new file mode 100644 index 000000000..14e34a866 --- /dev/null +++ b/ishtar_common/migrations/0053_auto_20180523_1504.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-05-23 15:04 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0052_m2m_images_migrate_imports'), + ] + + operations = [ + migrations.CreateModel( + name='CustomFormJsonField', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('label', models.CharField(blank=True, default=b'', max_length=200, verbose_name='Label')), + ('order', models.IntegerField(default=1, verbose_name='Order')), + ('help_text', models.TextField(blank=True, null=True, verbose_name='Help')), + ('custom_form', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='json_fields', to='ishtar_common.CustomForm')), + ], + options={ + 'verbose_name': 'Custom form - Json data field', + 'verbose_name_plural': 'Custom form - Json data fields', + }, + ), + migrations.AddField( + model_name='jsondatafield', + name='value_type', + field=models.CharField(choices=[(b'T', 'Text'), (b'LT', 'Long text'), (b'I', 'Integer'), (b'F', 'Float'), (b'D', 'Date'), (b'C', 'Choices')], default=b'T', max_length=10, verbose_name='Type'), + ), + migrations.AddField( + model_name='customformjsonfield', + name='json_field', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='custom_form_details', to='ishtar_common.JsonDataField'), + ), + migrations.AddField( + model_name='jsondatafield', + name='custom_forms', + field=models.ManyToManyField(blank=True, through='ishtar_common.CustomFormJsonField', to='ishtar_common.CustomForm'), + ), + ] -- cgit v1.2.3