From 5cc024b6d19dcba638c8cfa6ff2d8c0198b7e6b9 Mon Sep 17 00:00:00 2001 From: Nico Vermaas <vermaas@astron.nl> Date: Tue, 13 Apr 2021 10:03:13 +0200 Subject: [PATCH] add filter field to configuration table --- .../migrations/0006_configuration_filter.py | 18 ++++++++++++++++++ atdb/taskdatabase/models.py | 1 + .../templates/taskdatabase/index.html | 2 +- atdb/taskdatabase/views.py | 2 ++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 atdb/taskdatabase/migrations/0006_configuration_filter.py diff --git a/atdb/taskdatabase/migrations/0006_configuration_filter.py b/atdb/taskdatabase/migrations/0006_configuration_filter.py new file mode 100644 index 00000000..65ac9e16 --- /dev/null +++ b/atdb/taskdatabase/migrations/0006_configuration_filter.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.4 on 2021-04-13 08:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('taskdatabase', '0005_auto_20210330_1437'), + ] + + operations = [ + migrations.AddField( + model_name='configuration', + name='filter', + field=models.CharField(blank=True, max_length=30, null=True), + ), + ] diff --git a/atdb/taskdatabase/models.py b/atdb/taskdatabase/models.py index 36c69dc5..653bc098 100644 --- a/atdb/taskdatabase/models.py +++ b/atdb/taskdatabase/models.py @@ -89,6 +89,7 @@ class Status(models.Model): class Configuration(models.Model): + filter = models.CharField(max_length=30, blank=True, null=True) key = models.CharField(max_length=50) value = models.CharField(max_length=255) diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html index f64d3903..c92ef122 100644 --- a/atdb/taskdatabase/templates/taskdatabase/index.html +++ b/atdb/taskdatabase/templates/taskdatabase/index.html @@ -80,7 +80,7 @@ {% include 'taskdatabase/pagination.html' %} </div> </div> - <p class="footer"> Version 1.0.0 (6 apr 2021 - 14:00) + <p class="footer"> Version 1.0.0 (13 apr 2021 - 10:00) </div> diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py index 21575280..ac144e82 100644 --- a/atdb/taskdatabase/views.py +++ b/atdb/taskdatabase/views.py @@ -100,7 +100,9 @@ class ConfigurationFilter(filters.FilterSet): model = Configuration fields = { + 'filter': ['exact', 'icontains'], 'key': ['exact', 'icontains'], + 'value': ['exact', 'icontains'], } class JobFilter(filters.FilterSet): -- GitLab