Merge pull request #430 in RMS/api-main-service from gladys-dev2 to RMSv2

* commit 'd5e76cd4':
  migrations

app/entities/migrations/0029_auto_20191029_1455.py → app/entities/migrations/0028_auto_20191029_1513.py

-# Generated by Django 2.2 on 2019-10-29 14:55
+# Generated by Django 2.2 on 2019-10-29 15:13
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -7,7 +7,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('entities', '0028_remindertrigger_form_code'),
+        ('entities', '0027_assetgroup'),
     ]
 
     operations = [
@@ -16,6 +16,11 @@ class Migration(migrations.Migration):
             name='cancel_type',
             field=models.CharField(blank=True, max_length=255, null=True),
         ),
+        migrations.AddField(
+            model_name='remindertrigger',
+            name='form_code',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='entities.ChangeRequestFormHeader', to_field='form_code'),
+        ),
         migrations.AlterField(
             model_name='canceltrigger',
             name='frm_approver',

app/entities/migrations/0028_remindertrigger_form_code.py

-# Generated by Django 2.2 on 2019-10-29 11:26
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('entities', '0027_assetgroup'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='remindertrigger',
-            name='form_code',
-            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.PROTECT, to='entities.ChangeRequestFormHeader', to_field='form_code'),
-            preserve_default=False,
-        ),
-    ]

app/entities/models.py

@@ -1055,7 +1055,9 @@ class ReminderTrigger(models.Model):
     form_code = models.ForeignKey(
         ChangeRequestFormHeader,
         on_delete=models.PROTECT,
-        to_field='form_code')
+        to_field='form_code',
+        null=True,
+        blank=True)
 
     class Meta:
         db_table = 'reminder_trigger'