From 6b63e8bee35a9c763ede2d1fa81f7e23e731f4fa Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Thu, 20 Jun 2019 10:06:30 +0200 Subject: [PATCH 1/4] Always get details when requesting get_results --- gsa/src/gmp/commands/results.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gsa/src/gmp/commands/results.js b/gsa/src/gmp/commands/results.js index 189f9e4825..5eb6a68373 100644 --- a/gsa/src/gmp/commands/results.js +++ b/gsa/src/gmp/commands/results.js @@ -32,6 +32,10 @@ export class ResultsCommand extends EntitiesCommand { return root.get_results.get_results_response; } + get(params = {}, options) { + return super.get({...params, details: 1}, options); + } + getDescriptionWordCountsAggregates({filter} = {}) { return this.getAggregates({ aggregate_type: 'result', From 2e7d87f344d84628a14e025d7161d3710f543589 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Thu, 20 Jun 2019 10:06:53 +0200 Subject: [PATCH 2/4] Set correct result_id in NotesDialog --- gsa/src/web/pages/notes/dialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsa/src/web/pages/notes/dialog.js b/gsa/src/web/pages/notes/dialog.js index a310019472..649647b047 100644 --- a/gsa/src/web/pages/notes/dialog.js +++ b/gsa/src/web/pages/notes/dialog.js @@ -373,7 +373,7 @@ const NoteDialog = ({ name="result_uuid" size="34" disabled={state.result_id !== '0'} - value={state.result_uuid} + value={state.result_id} onChange={onValueChange} /> )} From 1cac90c814f7ea5fd24576862e15ef8d45a82bf4 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Thu, 20 Jun 2019 10:15:38 +0200 Subject: [PATCH 3/4] Update results command tests for details=1 param --- gsa/src/gmp/commands/__tests__/results.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gsa/src/gmp/commands/__tests__/results.js b/gsa/src/gmp/commands/__tests__/results.js index 7481eb5542..4ced874395 100644 --- a/gsa/src/gmp/commands/__tests__/results.js +++ b/gsa/src/gmp/commands/__tests__/results.js @@ -45,6 +45,7 @@ describe('ResultsCommand tests', () => { expect(fakeHttp.request).toHaveBeenCalledWith('get', { args: { cmd: 'get_results', + details: 1, filter: ALL_FILTER.toFilterString(), }, }); @@ -72,6 +73,7 @@ describe('ResultsCommand tests', () => { expect(fakeHttp.request).toHaveBeenCalledWith('get', { args: { cmd: 'get_results', + details: 1, }, }); const {data} = resp; From 4cafcc232da598b0821da813dc3b00cb6d454913 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Thu, 20 Jun 2019 10:19:52 +0200 Subject: [PATCH 4/4] Update Changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf763066a6..3b952975e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Add tooltips to deactivated text fields in AlertDialog [#1269](https://github.com/greenbone/gsa/pull/1269) ### Changed +- Always load notes and overrides when getting results [#1446](https://github.com/greenbone/gsa/pull/1446) - Disable some FileFields when RadioButton is not checked [#1430](https://github.com/greenbone/gsa/pull/1430) - Change checkboxes for solution types to radio buttons [#1398](https://github.com/greenbone/gsa/pull/1398) - Link to search in the manual for vulnerabilities [#1391](https://github.com/greenbone/gsa/pull/1391) @@ -52,6 +53,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Cleanup get_report function in gsad [#1263](https://github.com/greenbone/gsa/pull/1263) ### Fixed +- Show notes and overrides for results and their icon indicator in results rows [#1446](https://github.com/greenbone/gsa/pull/1446) - Display text if gvm-libs is build without LDAP and/or Radius support [#1437](https://github.com/greenbone/gsa/pull/1437) - Fix sending related resources in permission.create() [#1432](https://github.com/greenbone/gsa/pull/1432) - Don't allow bulk tagging vulnerabilities [#1429](https://github.com/greenbone/gsa/pull/1429)