From e4d27278758c3d304a8b48ecb6fe8c42bb6d9998 Mon Sep 17 00:00:00 2001
From: Crystal Lai <crystal.lai@greenbone.net>
Date: Thu, 28 Nov 2019 09:56:57 +0100
Subject: [PATCH 1/3] New note dialog: make all fields editable when fixed

---
 gsa/src/web/pages/notes/dialog.js | 54 ++++++++++++++-----------------
 1 file changed, 25 insertions(+), 29 deletions(-)

diff --git a/gsa/src/web/pages/notes/dialog.js b/gsa/src/web/pages/notes/dialog.js
index 649647b047..8d4b3b6cf2 100644
--- a/gsa/src/web/pages/notes/dialog.js
+++ b/gsa/src/web/pages/notes/dialog.js
@@ -122,11 +122,16 @@ const NoteDialog = ({
       {({values: state, onValueChange}) => {
         return (
           <Layout flex="column">
-            {state.fixed && (
+            {state.fixed && isDefined(oid) && (
               <FormGroup title={_('NVT')} flex="column">
                 <span>{renderNvtName(oid, nvt_name)}</span>
               </FormGroup>
             )}
+            {state.fixed && !isDefined(oid) && (
+              <FormGroup title={_('NVT')} flex="column">
+                <span>{renderNvtName(state.oid, nvt_name)}</span>
+              </FormGroup>
+            )}
             {is_edit && !state.fixed && (
               <FormGroup title={_('NVT')} flex="column">
                 <Radio
@@ -222,19 +227,16 @@ const NoteDialog = ({
               <Divider>
                 <Radio
                   name="hosts"
-                  title={state.fixed ? state.hosts_manual : ''}
                   checked={state.hosts === MANUAL}
                   value={MANUAL}
                   onChange={onValueChange}
                 />
-                {!state.fixed && (
-                  <TextField
-                    name="hosts_manual"
-                    disabled={state.hosts !== MANUAL}
-                    value={state.hosts_manual}
-                    onChange={onValueChange}
-                  />
-                )}
+                <TextField
+                  name="hosts_manual"
+                  disabled={state.hosts !== MANUAL}
+                  value={state.hosts_manual}
+                  onChange={onValueChange}
+                />
               </Divider>
             </FormGroup>
 
@@ -249,19 +251,16 @@ const NoteDialog = ({
               <Divider>
                 <Radio
                   name="port"
-                  title={state.fixed ? state.port_manual : ''}
                   checked={state.port === MANUAL}
                   value={MANUAL}
                   onChange={onValueChange}
                 />
-                {!state.fixed && (
-                  <TextField
-                    name="port_manual"
-                    disabled={state.port !== MANUAL}
-                    value={state.port_manual}
-                    onChange={onValueChange}
-                  />
-                )}
+                <TextField
+                  name="port_manual"
+                  disabled={state.port !== MANUAL}
+                  value={state.port_manual}
+                  onChange={onValueChange}
+                />
               </Divider>
             </FormGroup>
 
@@ -329,20 +328,17 @@ const NoteDialog = ({
               <Divider>
                 <Radio
                   name="task_id"
-                  title={state.fixed ? state.task_name : ''}
                   checked={state.task_id === '0'}
                   value="0"
                   onChange={onValueChange}
                 />
-                {!state.fixed && (
-                  <Select
-                    name="task_uuid"
-                    value={state.task_uuid}
-                    items={renderSelectItems(tasks)}
-                    disabled={state.task_id !== '0'}
-                    onChange={onValueChange}
-                  />
-                )}
+                <Select
+                  name="task_uuid"
+                  value={state.task_uuid}
+                  items={renderSelectItems(tasks)}
+                  disabled={state.task_id !== '0'}
+                  onChange={onValueChange}
+                />
               </Divider>
             </FormGroup>
 

From 314835866a377dd1e5dca32d5e9b203e19baac23 Mon Sep 17 00:00:00 2001
From: Crystal Lai <crystal.lai@greenbone.net>
Date: Thu, 28 Nov 2019 09:58:56 +0100
Subject: [PATCH 2/3] Edit previous changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f2b83822d..53fa742f31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   [#1507](https://github.com/greenbone/gsa/pull/1507)
 
 ### Changed
-- Override dialog: Make host/port/task fields editable even when fixed, and display oid when no name is defined [#1814](https://github.com/greenbone/gsa/pull/1814)
+- new override and note dialog: Make host/port/task fields editable even when fixed, and display oid when no name is defined [#1814](https://github.com/greenbone/gsa/pull/1814) [#1817](https://github.com/greenbone/gsa/pull/1817)
 - Use consistent setting naming [#1774](https://github.com/greenbone/gsa/pull/1774)
 - Consider visibility status of page for calculating the reload interval [#1761](https://github.com/greenbone/gsa/pull/1761)
 - Do not simplify filterString in content composer for report download [#1733](https://github.com/greenbone/gsa/pull/1733)

From 48ea3bea751a29181d418b4216462d578ceaab12 Mon Sep 17 00:00:00 2001
From: saberlynx <51318048+saberlynx@users.noreply.github.com>
Date: Thu, 28 Nov 2019 10:52:35 +0100
Subject: [PATCH 3/3] Update CHANGELOG.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Björn Ricks <bjoern.ricks@greenbone.net>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53fa742f31..5ad7587d4e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   [#1507](https://github.com/greenbone/gsa/pull/1507)
 
 ### Changed
-- new override and note dialog: Make host/port/task fields editable even when fixed, and display oid when no name is defined [#1814](https://github.com/greenbone/gsa/pull/1814) [#1817](https://github.com/greenbone/gsa/pull/1817)
+- New override and note dialog: Make host/port/task fields editable even when fixed, and display oid when no name is defined [#1814](https://github.com/greenbone/gsa/pull/1814) [#1817](https://github.com/greenbone/gsa/pull/1817)
 - Use consistent setting naming [#1774](https://github.com/greenbone/gsa/pull/1774)
 - Consider visibility status of page for calculating the reload interval [#1761](https://github.com/greenbone/gsa/pull/1761)
 - Do not simplify filterString in content composer for report download [#1733](https://github.com/greenbone/gsa/pull/1733)