From 975aba20219d3d97ed79e155f24a7309083044b8 Mon Sep 17 00:00:00 2001 From: Uday Sagar Date: Fri, 25 Oct 2024 10:00:09 +0000 Subject: [PATCH] merge migrations --- ...te_alter_fileupload_file_type_and_more.py} | 8 +++++++- .../migrations/0467_patientnotes_root_note.py | 19 ------------------- 2 files changed, 7 insertions(+), 20 deletions(-) rename care/facility/migrations/{0466_alter_fileupload_file_type_alter_notification_event.py => 0466_patientnotes_root_note_alter_fileupload_file_type_and_more.py} (80%) delete mode 100644 care/facility/migrations/0467_patientnotes_root_note.py diff --git a/care/facility/migrations/0466_alter_fileupload_file_type_alter_notification_event.py b/care/facility/migrations/0466_patientnotes_root_note_alter_fileupload_file_type_and_more.py similarity index 80% rename from care/facility/migrations/0466_alter_fileupload_file_type_alter_notification_event.py rename to care/facility/migrations/0466_patientnotes_root_note_alter_fileupload_file_type_and_more.py index dd1f4a11e5..7c93a1f509 100644 --- a/care/facility/migrations/0466_alter_fileupload_file_type_alter_notification_event.py +++ b/care/facility/migrations/0466_patientnotes_root_note_alter_fileupload_file_type_and_more.py @@ -1,5 +1,6 @@ -# Generated by Django 5.1.1 on 2024-10-01 21:58 +# Generated by Django 5.1.1 on 2024-10-25 09:57 +import django.db.models.deletion from django.db import migrations, models @@ -10,6 +11,11 @@ class Migration(migrations.Migration): ] operations = [ + migrations.AddField( + model_name='patientnotes', + name='root_note', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='child_notes', to='facility.patientnotes'), + ), migrations.AlterField( model_name='fileupload', name='file_type', diff --git a/care/facility/migrations/0467_patientnotes_root_note.py b/care/facility/migrations/0467_patientnotes_root_note.py deleted file mode 100644 index a4a10cdca8..0000000000 --- a/care/facility/migrations/0467_patientnotes_root_note.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 5.1.1 on 2024-10-25 07:13 - -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('facility', '0466_alter_fileupload_file_type_alter_notification_event'), - ] - - operations = [ - migrations.AddField( - model_name='patientnotes', - name='root_note', - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='child_notes', to='facility.patientnotes'), - ), - ]