From a5ead94274c134e6b8f16576ee7c8ca50364bbe3 Mon Sep 17 00:00:00 2001 From: Nasir Hussain Date: Tue, 7 Apr 2020 13:46:32 +0500 Subject: [PATCH] ACT-688 Reworked migrations --- ...0200403_0218.py => 0003_auto_20200407_0146.py} | 4 ++-- ...0200403_0218.py => 0018_auto_20200407_0146.py} | 15 ++------------- 2 files changed, 4 insertions(+), 15 deletions(-) rename formlibrary/migrations/{0003_auto_20200403_0218.py => 0003_auto_20200407_0146.py} (95%) rename workflow/migrations/{0014_auto_20200403_0218.py => 0018_auto_20200407_0146.py} (88%) diff --git a/formlibrary/migrations/0003_auto_20200403_0218.py b/formlibrary/migrations/0003_auto_20200407_0146.py similarity index 95% rename from formlibrary/migrations/0003_auto_20200403_0218.py rename to formlibrary/migrations/0003_auto_20200407_0146.py index 17529893..251e9f63 100644 --- a/formlibrary/migrations/0003_auto_20200403_0218.py +++ b/formlibrary/migrations/0003_auto_20200407_0146.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.10 on 2020-04-03 09:18 +# Generated by Django 2.2.10 on 2020-04-07 08:46 from django.db import migrations, models import django.db.models.deletion @@ -7,7 +7,7 @@ class Migration(migrations.Migration): dependencies = [ - ('workflow', '0014_auto_20200403_0218'), + ('workflow', '0018_auto_20200407_0146'), ('formlibrary', '0002_auto_20200215_0114'), ] diff --git a/workflow/migrations/0014_auto_20200403_0218.py b/workflow/migrations/0018_auto_20200407_0146.py similarity index 88% rename from workflow/migrations/0014_auto_20200403_0218.py rename to workflow/migrations/0018_auto_20200407_0146.py index b66d16e9..c70c60a7 100644 --- a/workflow/migrations/0014_auto_20200403_0218.py +++ b/workflow/migrations/0018_auto_20200407_0146.py @@ -1,13 +1,12 @@ -# Generated by Django 2.2.10 on 2020-04-03 09:18 +# Generated by Django 2.2.10 on 2020-04-07 08:46 from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('workflow', '0013_auto_20200329_0551'), + ('workflow', '0017_merge_20200403_0643'), ] operations = [ @@ -128,14 +127,4 @@ class Migration(migrations.Migration): name='individual_type', field=models.CharField(blank=True, help_text='i.e. Farmer, Association, Student, Govt, etc.', max_length=255, null=True, verbose_name='Type of direct individuals'), ), - migrations.AlterField( - model_name='historicalprojectagreement', - name='project_status', - field=models.ForeignKey(blank=True, db_constraint=False, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='+', to='workflow.ProjectStatus', verbose_name='Project Status'), - ), - migrations.AlterField( - model_name='projectagreement', - name='project_status', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='workflow.ProjectStatus', verbose_name='Project Status'), - ), ]