Skip to content
Snippets Groups Projects
Commit 2c0e692c authored by Nico Vermaas's avatar Nico Vermaas
Browse files

Merge branch 'SDC-438-filters-on-dashboard' into 'master'

change task.environment from JSONField to String

See merge request !206
parents 139f3865 b93b9368
Branches
No related tags found
2 merge requests!207Master,!206change task.environment from JSONField to String
Pipeline #24912 passed
# 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',
),
]
# 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),
),
]
...@@ -41,7 +41,8 @@ class Task(models.Model): ...@@ -41,7 +41,8 @@ class Task(models.Model):
# Task control properties # Task control properties
task_type = models.CharField(max_length=20, default="regular") task_type = models.CharField(max_length=20, default="regular")
filter = models.CharField(max_length=30, blank=True, null=True) 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) 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) status = models.CharField(db_index=True, default="unknown", max_length=50,blank=True, null=True)
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
{% include 'taskdatabase/pagination.html' %} {% include 'taskdatabase/pagination.html' %}
</div> </div>
</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> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment