Merge pull request #1291 from sarahd93/port-ranges_gsa8

Fix port ranges from file radio button
greenbone · Apr 17, 2019 · 6fc3909 · 6fc3909
2 parents 41df22f + 2ddaa94
commit 6fc3909
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -8,6 +8,7 @@ $ cd gsa && git checkout gsa-8.0 && git log
 
 ## gsa 8.0.1 (unreleased)
 
+* Fix port ranges from file radio button #1291
  * Don't run more then one reload timer for a page #1289
  * Set first=1 when starting delta report selection #1288
  * Fix pagination with default filter (reset filter.id if filter is changed) #1288

diff --git a/gsa/src/web/pages/portlists/dialog.js b/gsa/src/web/pages/portlists/dialog.js
@@ -20,7 +20,7 @@ import React from 'react';
 
 import _ from 'gmp/locale';
 
-import {NO_VALUE, YES_VALUE} from 'gmp/parser';
+import {NO_VALUE, YES_VALUE, parseYesNo} from 'gmp/parser';
 
 import {isDefined} from 'gmp/utils/identity';
 
@@ -119,13 +119,13 @@ const PortListsDialog = ({
                       name="from_file"
                       value={NOT_FROM_FILE}
                       onChange={onValueChange}
-                      checked={from_file !== FROM_FILE}
+                      checked={parseYesNo(state.from_file) !== FROM_FILE}
                     />
                     <TextField
                       grow="1"
                       name="port_range"
                       value={state.port_range}
-                      disabled={from_file === FROM_FILE}
+                      disabled={parseYesNo(state.from_file) === FROM_FILE}
                       onChange={onValueChange}
                       size="30"
                     />
@@ -136,7 +136,7 @@ const PortListsDialog = ({
                       name="from_file"
                       value={FROM_FILE}
                       onChange={onValueChange}
-                      checked={from_file === FROM_FILE}
+                      checked={parseYesNo(state.from_file) === FROM_FILE}
                     />
                     <FileField name="file" onChange={onValueChange} />
                   </Divider>