Skip to content

Commit

Permalink
Merge pull request #2570 from swaterkamp/DeltSorting
Browse files Browse the repository at this point in the history
Always send sort=name with delta report request filters
  • Loading branch information
sarahd93 authored Nov 13, 2020
2 parents 19ae4ab + 44a7580 commit be7b41b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Added option for "Start Task" event upon "New SecInfo arrived" condition in alerts dialog [#2418](https://github.com/greenbone/gsa/pull/2418)

### Changed
- Always send sort=name with delta report request filters [#2570](https://github.com/greenbone/gsa/pull/2570)
- Changed trash icon to delete icon on host detailspage [#2565](https://github.com/greenbone/gsa/pull/2565)
- Change tooltip of override icon in result details [#2467](https://github.com/greenbone/gsa/pull/2467)
- For edit config/policy dialog, only send name and comment if config or policy is in use, and add in use notification [#2463](https://github.com/greenbone/gsa/pull/2463)
Expand Down
10 changes: 6 additions & 4 deletions gsa/src/web/pages/reports/deltadetailspage.js
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,11 @@ const load = ({
filter = DEFAULT_FILTER;
}

// to avoid confusion of loaded results with different sort terms and
// directions, always load the report with sort=name from gvmd (the user's
// sort term will be handled by GSA in the browser)
filter.delete('sort-reverse');
filter.set('sort', 'name');
return loadReportIfNeeded(reportId, deltaReportId, filter).then(() =>
loadReport(reportId, deltaReportId, filter),
);
Expand Down Expand Up @@ -717,10 +722,7 @@ export default compose(
withGmp,
withDialogNotification,
withDownload,
connect(
mapStateToProps,
mapDispatchToProps,
),
connect(mapStateToProps, mapDispatchToProps),
)(DeltaReportDetailsWrapper);

// vim: set ts=2 sw=2 tw=80:

0 comments on commit be7b41b

Please sign in to comment.