Merge pull request #1546 from jhelmold/remediation_ticket_sorting

Fixed the sorting / filter by username functionality for remediation tickets
greenbone · Jun 3, 2021 · 21fee5c · 21fee5c
2 parents 5feada5 + b92cc8a
commit 21fee5c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -98,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
 

diff --git 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                                                      \
    },                                                                         \
    {                                                                          \