From ead1083eb9a573a51e10c23644ab1facf9d5246f Mon Sep 17 00:00:00 2001
From: Nico Vermaas <vermaas@astron.nl>
Date: Mon, 3 Jan 2022 17:21:39 +0100
Subject: [PATCH] add SAS_ID__IN and PROJECT__IN filters on query page
---
atdb/taskdatabase/templates/taskdatabase/index.html | 2 +-
atdb/taskdatabase/views.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/atdb/taskdatabase/templates/taskdatabase/index.html b/atdb/taskdatabase/templates/taskdatabase/index.html
index a24be519..a9720c18 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 (14 dec 2021 - 12:00)
+ <p class="footer"> Version 1.0.0 (3 jan 2021 - 17:00)
</div>
diff --git a/atdb/taskdatabase/views.py b/atdb/taskdatabase/views.py
index 0ff3290b..33840c27 100644
--- a/atdb/taskdatabase/views.py
+++ b/atdb/taskdatabase/views.py
@@ -50,7 +50,7 @@ class TaskFilter(filters.FilterSet):
'filter': ['exact', 'icontains'],
'workflow__id' : ['exact', 'icontains'],
'project': ['exact', 'icontains'],
- 'sas_id': ['exact', 'icontains'],
+ 'sas_id': ['exact', 'icontains','in'],
'status': ['exact', 'icontains', 'in', 'startswith'],
'purge_policy': ['exact'],
'priority': ['exact','lte','gte'],
@@ -72,8 +72,8 @@ class TaskFilterQueryPage(filters.FilterSet):
'filter': ['exact', 'icontains'],
'priority': ['exact', 'gte', 'lte'],
'status': ['icontains', 'in'],
- 'project': ['exact', 'icontains'],
- 'sas_id': ['exact', 'icontains'],
+ 'project': ['exact', 'icontains','in'],
+ 'sas_id': ['exact', 'icontains', 'in'],
#'resume': ['exact'],
}
--
GitLab