Merge pull request #1446 from swaterkamp/ResultsNotesOverrides

Show Notes and Overrides of Results
greenbone · Jun 20, 2019 · d2f2657 · d2f2657
2 parents d945151 + 4cafcc2
commit d2f2657
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git 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)

diff --git 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;

diff --git 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',

diff --git 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}
                   />
                 )}