From a33b059ca854a347a638bd302d5890427137d564 Mon Sep 17 00:00:00 2001 From: Jorrit Schaap <schaap@astron.nl> Date: Mon, 22 Mar 2021 11:41:33 +0100 Subject: [PATCH] TMSS-601: migrations of 601-with-master-merged-in --- .../backend/src/tmss/tmssapp/migrations/0001_initial.py | 6 +++--- .../backend/src/tmss/tmssapp/migrations/0002_populate.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py index a9d62cf4208..6d5b024f76d 100644 --- a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py +++ b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.0.9 on 2021-03-15 16:29 +# Generated by Django 3.0.9 on 2021-03-22 10:34 from django.conf import settings import django.contrib.postgres.fields @@ -453,7 +453,7 @@ class Migration(migrations.Migration): ('name', models.CharField(help_text='Human-readable name of this object.', max_length=128)), ('description', models.CharField(help_text='Short description for this reservation, used in overviews', max_length=255)), ('start_time', models.DateTimeField(help_text='Start of this reservation.')), - ('stop_time', models.DateTimeField(help_text='Stop time of this reservation. If null, then this reservation is indefinitely.', null=True)), + ('stop_time', models.DateTimeField(help_text='Stop of this reservation. If null, then this reservation is indefinitely.', null=True)), ('specifications_doc', django.contrib.postgres.fields.jsonb.JSONField(help_text='Properties of this reservation')), ], options={ @@ -1214,7 +1214,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='projectquotaarchivelocation', name='project_quota', - field=models.ForeignKey(help_text='Project to wich this quota belongs.', on_delete=django.db.models.deletion.PROTECT, related_name='project_quota', to='tmssapp.ProjectQuota'), + field=models.ForeignKey(help_text='The ProjectQuota for this archive location', on_delete=django.db.models.deletion.PROTECT, related_name='project_quota_archive_location', to='tmssapp.ProjectQuota'), ), migrations.AddField( model_name='projectquota', diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0002_populate.py b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0002_populate.py index 0fece500a4f..92baffd4c15 100644 --- a/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0002_populate.py +++ b/SAS/TMSS/backend/src/tmss/tmssapp/migrations/0002_populate.py @@ -21,4 +21,4 @@ class Migration(migrations.Migration): migrations.RunPython(populate_misc), migrations.RunPython(populate_resources), migrations.RunPython(populate_cycles), - migrations.RunPython(populate_projects)] + migrations.RunPython(populate_projects) ] -- GitLab