Merge pull request #1733 from swaterkamp/RepoContCompSimpleFilter

Don't simplify filter in report content composer
greenbone · Nov 4, 2019 · 270d426 · 270d426
2 parents ad2fd22 + fd1beb7
commit 270d426
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   [#1507](https://github.com/greenbone/gsa/pull/1507)
 
 ### Changed
+- Do not simplify filterString in content composer for report download [#1733](https://github.com/greenbone/gsa/pull/1733)
 - Use single component for reloading data [#1722](https://github.com/greenbone/gsa/pull/1722)
 - Use last chars of a label string in BarChart [#1713](https://github.com/greenbone/gsa/pull/1713)
 - Next Scheduled Tasks displays timezone [#1712](https://github.com/greenbone/gsa/pull/1712)

diff --git a/gsa/src/web/pages/reports/downloadreportdialog.js b/gsa/src/web/pages/reports/downloadreportdialog.js
@@ -58,9 +58,7 @@ const DownloadReportDialog = ({
   onClose,
   onSave,
 }) => {
-  const filterString = isString(filter)
-    ? filter
-    : filter.simple().toFilterString();
+  const filterString = isString(filter) ? filter : filter.toFilterString();
 
   reportFormatId = selectSaveId(reportFormats, defaultReportFormatId);