Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show correct information at task details #1515

Merged
merged 2 commits into from
Jul 24, 2019
Merged

Show correct information at task details #1515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f503660
Show correct information at task details
swaterkamp Jul 24, 2019
55d233a
Update Changelog
swaterkamp Jul 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
logged in [#1508](https://github.com/greenbone/gsa/pull/1508)

### Fixed
- Fix showing details for tasks [#1515](https://github.com/greenbone/gsa/pull/1515)
- Fix using filename templates from usersettings [#1512](https://github.com/greenbone/gsa/pull/1512)
- Allow to use additional options for starting gsad via systemd
[#1514](https://github.com/greenbone/gsa/pull/1514)
Expand Down
12 changes: 7 additions & 5 deletions gsa/src/web/pages/tasks/details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,10 @@ class TaskDetails extends React.Component {
scanner,
schedule_periods,
target,
max_checks,
max_hosts,
} = entity;
const {max_checks = {}, iface = {}, max_hosts = {}} = preferences;
const {iface = {}} = preferences;

let dur;
const has_duration =
Expand Down Expand Up @@ -197,22 +199,22 @@ class TaskDetails extends React.Component {
)}
{isDefined(scanConfig) &&
scanConfig.scan_config_type === OPENVAS_SCAN_CONFIG_TYPE &&
isDefined(max_checks.name) && (
isDefined(max_checks) && (
<TableRow>
<TableData>
{_('Maximum concurrently executed NVTs per host')}
</TableData>
<TableData>{max_checks.value}</TableData>
<TableData>{max_checks}</TableData>
</TableRow>
)}
{isDefined(scanConfig) &&
scanConfig.scan_config_type === OPENVAS_SCAN_CONFIG_TYPE &&
isDefined(max_hosts.name) && (
isDefined(max_hosts) && (
<TableRow>
<TableData>
{_('Maximum concurrently scanned hosts')}
</TableData>
<TableData>{max_hosts.value}</TableData>
<TableData>{max_hosts}</TableData>
</TableRow>
)}
</TableBody>
Expand Down