From 71518d6ab091c735bbe10d89b8383b659ce60a6a Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Fri, 21 May 2021 12:08:39 +0200 Subject: [PATCH 1/3] Fix setting includeRelated (cherry picked from commit dd6f03cb0ffd008ae1ebc051183ba4e8f7b4bf61) --- gsa/src/web/pages/permissions/multipledialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gsa/src/web/pages/permissions/multipledialog.js b/gsa/src/web/pages/permissions/multipledialog.js index 6f07fa7566..db0734a71c 100644 --- a/gsa/src/web/pages/permissions/multipledialog.js +++ b/gsa/src/web/pages/permissions/multipledialog.js @@ -200,7 +200,7 @@ const MultiplePermissionDialog = withCapabilities( name="includeRelated" value={state.includeRelated} items={includeRelatedItems} - onChange={onValueChange} + onChange={onChange} /> {hasRelated && ( From 331cf7651dad24791276d3389eb5aa56ed013c61 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Fri, 21 May 2021 12:17:23 +0200 Subject: [PATCH 2/3] Update Changelog (cherry picked from commit e8396ed34937517549e0c40018bea1ca2d4eea66) # Conflicts: # CHANGELOG.md --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d3dfba794..619304583b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -109,12 +109,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Use greenbone sensor as default scanner type when opening the dialog if available [#2867](https://github.com/greenbone/gsa/pull/2867), [#2924](https://github.com/greenbone/gsa/pull/2924) ### Fixed +<<<<<<< HEAD - Fixed number-only names within schedules/dialog [#2914](https://github.com/greenbone/gsa/pull/2914) - Fixed changing Trend and Select for NVT-families and whole selection only [#2905](https://github.com/greenbone/gsa/pull/2905) - Fixed missing name for CVE results on result detailspage [#2892](https://github.com/greenbone/gsa/pull/2892) - Fix setting secret key in RADIUS dialog [#2891](https://github.com/greenbone/gsa/pull/2891) - Fix setting result UUID in notes dialog [#2889](https://github.com/greenbone/gsa/pull/2889) +======= +- Fixed setting whether to include related resources for new permissions [#2931](https://github.com/greenbone/gsa/pull/2891) +- Fixed setting secret key in RADIUS dialog, backport from [#2891](https://github.com/greenbone/gsa/pull/2891), [#2915](https://github.com/greenbone/gsa/pull/2915) +>>>>>>> e8396ed34 (Update Changelog) ### Removed [21.04.1]: https://github.com/greenbone/gsa/compare/v21.4.0...gsa-21.04 From 9593b81612bc9d3b1dd0dd720b851807c2a30826 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp <32056637+swaterkamp@users.noreply.github.com> Date: Fri, 21 May 2021 15:22:13 +0200 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 619304583b..c459d5509b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -109,17 +109,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Use greenbone sensor as default scanner type when opening the dialog if available [#2867](https://github.com/greenbone/gsa/pull/2867), [#2924](https://github.com/greenbone/gsa/pull/2924) ### Fixed -<<<<<<< HEAD +- Fixed setting whether to include related resources for new permissions [#2931](https://github.com/greenbone/gsa/pull/2931) - Fixed number-only names within schedules/dialog [#2914](https://github.com/greenbone/gsa/pull/2914) - Fixed changing Trend and Select for NVT-families and whole selection only [#2905](https://github.com/greenbone/gsa/pull/2905) - Fixed missing name for CVE results on result detailspage [#2892](https://github.com/greenbone/gsa/pull/2892) - Fix setting secret key in RADIUS dialog [#2891](https://github.com/greenbone/gsa/pull/2891) - Fix setting result UUID in notes dialog [#2889](https://github.com/greenbone/gsa/pull/2889) -======= -- Fixed setting whether to include related resources for new permissions [#2931](https://github.com/greenbone/gsa/pull/2891) -- Fixed setting secret key in RADIUS dialog, backport from [#2891](https://github.com/greenbone/gsa/pull/2891), [#2915](https://github.com/greenbone/gsa/pull/2915) ->>>>>>> e8396ed34 (Update Changelog) ### Removed [21.04.1]: https://github.com/greenbone/gsa/compare/v21.4.0...gsa-21.04