From b93b93682026835e5509a0385ff8239444565d8a Mon Sep 17 00:00:00 2001 From: Nico Vermaas <vermaas@astron.nl> Date: Fri, 11 Feb 2022 08:24:28 +0100 Subject: [PATCH] change task.environment from JSONField to String --- .../migrations/0013_remove_task_environment.py | 17 +++++++++++++++++ .../migrations/0014_task_environment.py | 18 ++++++++++++++++++ atdb/taskdatabase/models.py | 3 ++- .../templates/taskdatabase/index.html | 2 +- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 atdb/taskdatabase/migrations/0013_remove_task_environment.py create mode 100644 atdb/taskdatabase/migrations/0014_task_environment.py diff --git a/atdb/taskdatabase/migrations/0013_remove_task_environment.py b/atdb/taskdatabase/migrations/0013_remove_task_environment.py new file mode 100644 index 00000000..723158a6 --- /dev/null +++ b/atdb/taskdatabase/migrations/0013_remove_task_environment.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.4 on 2022-02-11 07:22 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('taskdatabase', '0012_task_environment'), + ] + + operations = [ + migrations.RemoveField( + model_name='task', + name='environment', + ), + ] diff --git a/atdb/taskdatabase/migrations/0014_task_environment.py b/atdb/taskdatabase/migrations/0014_task_environment.py new file mode 100644 index 00000000..3ecb984c --- /dev/null +++ b/atdb/taskdatabase/migrations/0014_task_environment.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.4 on 2022-02-11 07:23 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('taskdatabase', '0013_remove_task_environment'), + ] + + operations = [ + migrations.AddField( + model_name='task', + name='environment', + field=models.CharField(blank=True, max_length=255, null=True), + ), + ] diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index fb34d802..4d51bcf2 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -41,7 +41,8 @@ class Task(models.Model): # Task control properties task_type = models.CharField(max_length=20, default="regular") filter = models.CharField(max_length=30, blank=True, null=True) - environment = models.JSONField(null=True, blank=True) + #environment = models.JSONField(null=True, blank=True) + environment = models.CharField(max_length=255, blank=True, null=True) new_status = models.CharField(max_length=50, default="defining", null=True) status = models.CharField(db_index=True, default="unknown", max_length=50,blank=True, null=True) diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index 2dc0d7ca..b09ea911 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -34,7 +34,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 1.0.0 (8 feb 2021 - 17:00) + <p class="footer"> Version 1.0.0 (11 feb 2021 - 8:00) </div> -- GitLab