From ae8b49467c03bf354d9c431b060fcc1336431603 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Fri, 30 Apr 2021 11:19:40 +0200 Subject: [PATCH 1/4] Fix setting result UUID in notes dialog (cherry picked from commit 5ab684b5cc3d3deb05c434cea3e275ac9d3ca9cd) # Conflicts: # gsa/src/web/pages/notes/dialog.js --- gsa/src/web/pages/notes/dialog.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gsa/src/web/pages/notes/dialog.js b/gsa/src/web/pages/notes/dialog.js index ef98d30b7a..18c4a31af5 100644 --- a/gsa/src/web/pages/notes/dialog.js +++ b/gsa/src/web/pages/notes/dialog.js @@ -36,6 +36,7 @@ import { ACTIVE_YES_FOR_NEXT_VALUE, ACTIVE_NO_VALUE, RESULT_ANY, + RESULT_UUID, } from 'gmp/models/override'; import DateTime from 'web/components/date/datetime'; @@ -347,8 +348,13 @@ const NoteDialog = ({ >>>>>> 5ab684b5cc... Fix setting result UUID in notes dialog onChange={onValueChange} /> @@ -361,16 +367,26 @@ const NoteDialog = ({ }) : _('UUID') } +<<<<<<< HEAD checked={state.resultId === '0'} value="0" +======= + checked={state.result_id === RESULT_UUID} + value={RESULT_UUID} +>>>>>>> 5ab684b5cc... Fix setting result UUID in notes dialog onChange={onValueChange} /> {!fixed && ( >>>>>> 5ab684b5cc... Fix setting result UUID in notes dialog onChange={onValueChange} /> )} From 5e03ea1e4a598ca88448a2fe501ac6a08817611e Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Fri, 30 Apr 2021 11:20:55 +0200 Subject: [PATCH 2/4] Update Changelog (cherry picked from commit 79a083c3e5e972e51d6d699502022a171f16877f) # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca219c6b90..cc5f093c17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -70,10 +70,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Added missing fields for getScanners query and parseObject() for scanner model [#2301](https://github.com/greenbone/gsa/pull/2301) ### Fixed +<<<<<<< HEAD - Fixed redirection of createNote on Note detailspage [#2777](https://github.com/greenbone/gsa/pull/2777) - Fixed ScanConfigs and Policies page after changes in [Hyperion](https://github.com/greenbone/hyperion/pull/15) [#2733](https://github.com/greenbone/gsa/pull/2733) - Fixed reload interval for pages using useEntityReloadInterval and useEntitiesReloadInterval hooks [#2716](https://github.com/greenbone/gsa/pull/2716) +======= +- Fix setting result UUID in notes dialog [#2889](https://github.com/greenbone/gsa/pull/2889) +>>>>>>> 79a083c3e5... Update Changelog ### Removed From 490028c0300a6422d485905621fc911b7a121c45 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp <32056637+swaterkamp@users.noreply.github.com> Date: Fri, 30 Apr 2021 12:35:34 +0200 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc5f093c17..e5412dcceb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -70,14 +70,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Added missing fields for getScanners query and parseObject() for scanner model [#2301](https://github.com/greenbone/gsa/pull/2301) ### Fixed -<<<<<<< HEAD +- Fix setting result UUID in notes dialog [#2889](https://github.com/greenbone/gsa/pull/2889) - Fixed redirection of createNote on Note detailspage [#2777](https://github.com/greenbone/gsa/pull/2777) - Fixed ScanConfigs and Policies page after changes in [Hyperion](https://github.com/greenbone/hyperion/pull/15) [#2733](https://github.com/greenbone/gsa/pull/2733) - Fixed reload interval for pages using useEntityReloadInterval and useEntitiesReloadInterval hooks [#2716](https://github.com/greenbone/gsa/pull/2716) -======= -- Fix setting result UUID in notes dialog [#2889](https://github.com/greenbone/gsa/pull/2889) ->>>>>>> 79a083c3e5... Update Changelog ### Removed From 93ad539e131c91eaceb7cd4905023bff10530273 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp <32056637+swaterkamp@users.noreply.github.com> Date: Fri, 30 Apr 2021 12:36:41 +0200 Subject: [PATCH 4/4] Update dialog.js --- gsa/src/web/pages/notes/dialog.js | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/gsa/src/web/pages/notes/dialog.js b/gsa/src/web/pages/notes/dialog.js index 18c4a31af5..fa227581b0 100644 --- a/gsa/src/web/pages/notes/dialog.js +++ b/gsa/src/web/pages/notes/dialog.js @@ -348,13 +348,8 @@ const NoteDialog = ({ >>>>>> 5ab684b5cc... Fix setting result UUID in notes dialog onChange={onValueChange} /> @@ -367,26 +362,16 @@ const NoteDialog = ({ }) : _('UUID') } -<<<<<<< HEAD - checked={state.resultId === '0'} - value="0" -======= checked={state.result_id === RESULT_UUID} value={RESULT_UUID} ->>>>>>> 5ab684b5cc... Fix setting result UUID in notes dialog onChange={onValueChange} /> {!fixed && ( >>>>>> 5ab684b5cc... Fix setting result UUID in notes dialog onChange={onValueChange} /> )}