From 6ce2d7294e8c61485e2bd7950c33be39d28df7a0 Mon Sep 17 00:00:00 2001 From: Johannes Helmold Date: Thu, 3 Jun 2021 11:12:14 +0200 Subject: [PATCH 1/3] Solved the reports remediation ticket sorting issue. In manage_sql_tickets.c: Added the alias "username" to the according row of the TICKET_ITERATOR_COLUMNS. Added the "username" to the TICKET_ITERATOR_FILTER_COLUMNS. --- src/manage_sql_tickets.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/manage_sql_tickets.c b/src/manage_sql_tickets.c index f44703e47..55d536140 100644 --- a/src/manage_sql_tickets.c +++ b/src/manage_sql_tickets.c @@ -78,7 +78,7 @@ ticket_status_integer (const char *status) #define TICKET_ITERATOR_FILTER_COLUMNS \ { GET_ITERATOR_FILTER_COLUMNS, "severity", "host", "location", \ "solution_type", "status", "opened", "fixed", "closed", "orphan", \ - "result_id", NULL } + "result_id", "username", NULL } /** * @brief Ticket iterator columns. @@ -154,7 +154,7 @@ ticket_status_integer (const char *status) { "nvt", NULL, KEYWORD_TYPE_STRING }, \ { \ "(SELECT name FROM users WHERE id = assigned_to)", \ - NULL, \ + "username", \ KEYWORD_TYPE_STRING \ }, \ { \ From 750dda3c50854374fd8a907bafceca1c4a33e444 Mon Sep 17 00:00:00 2001 From: Johannes Helmold Date: Thu, 3 Jun 2021 11:31:43 +0200 Subject: [PATCH 2/3] Added changelog entry for remediation ticket sorting issue. --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a559663a..637d2d554 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Update subject alternative name in certificate generation [#1503](https://github.com/greenbone/gvmd/pull/1503) - Fix whole-only config family selection [#1517](https://github.com/greenbone/gvmd/pull/1517) - Migrate GMP Scanners to OSP Sensors [#1533](https://github.com/greenbone/gvmd/pull/1533) +- Resolved remediation ticket sorting issue [#1546](https://github.com/greenbone/gvmd/pull/1546) [21.4.0]: https://github.com/greenbone/gvmd/compare/v21.4.0...gvmd-21.04 From b92cc8abf2d7c9f3ded25d953a53e9b7c0ae0774 Mon Sep 17 00:00:00 2001 From: Johannes Helmold Date: Thu, 3 Jun 2021 14:33:32 +0200 Subject: [PATCH 3/3] Changed / moved changelog entry for remediation ticket sorting issue. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 637d2d554..1ca80e215 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Update subject alternative name in certificate generation [#1503](https://github.com/greenbone/gvmd/pull/1503) - Fix whole-only config family selection [#1517](https://github.com/greenbone/gvmd/pull/1517) - Migrate GMP Scanners to OSP Sensors [#1533](https://github.com/greenbone/gvmd/pull/1533) -- Resolved remediation ticket sorting issue [#1546](https://github.com/greenbone/gvmd/pull/1546) [21.4.0]: https://github.com/greenbone/gvmd/compare/v21.4.0...gvmd-21.04 @@ -99,6 +98,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Escape TLS certificate DNs that are invalid UTF-8 [#1486](https://github.com/greenbone/gvmd/pull/1486) - Free alert get data in report_content_for_alert [#1526](https://github.com/greenbone/gvmd/pull/1526) - Fix erroneous freeing of ical timezone component [#1530](https://github.com/greenbone/gvmd/pull/1530) +- Fixed the sorting / filter by username functionality for remediation tickets [#1546](https://github.com/greenbone/gvmd/pull/1546) ### Removed