From fbd4e4d74954dce3dee66165547681499345e681 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Wed, 19 Feb 2020 10:28:22 +0100 Subject: [PATCH 1/2] Adjust DEFAULT_OID_VALUE for use with new oid scheme --- gsa/src/gmp/models/override.js | 2 +- gsa/src/web/pages/results/details.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gsa/src/gmp/models/override.js b/gsa/src/gmp/models/override.js index 1f65811802..b3bc5048c2 100644 --- a/gsa/src/gmp/models/override.js +++ b/gsa/src/gmp/models/override.js @@ -39,7 +39,7 @@ export const ACTIVE_YES_ALWAYS_VALUE = '-1'; export const ACTIVE_YES_UNTIL_VALUE = '-2'; export const DEFAULT_DAYS = 30; -export const DEFAULT_OID_VALUE = '1.3.6.1.4.1.25623.1.0.'; +export const DEFAULT_OID_VALUE = '1.3.6.1.4.1.25623.1.'; export const TASK_ANY = ''; export const TASK_SELECTED = '0'; diff --git a/gsa/src/web/pages/results/details.js b/gsa/src/web/pages/results/details.js index 219b8517f7..f579f5b94e 100644 --- a/gsa/src/web/pages/results/details.js +++ b/gsa/src/web/pages/results/details.js @@ -29,6 +29,8 @@ import {isEmpty} from 'gmp/utils/string'; import {TAG_NA} from 'gmp/models/nvt'; +import {DEFAULT_OID_VALUE} from 'gmp/models/override'; + import Layout from 'web/components/layout/layout'; import PropTypes from 'web/utils/proptypes'; @@ -299,7 +301,7 @@ const ResultDetails = ({className, links = true, entity}) => { {oid} )} - {isDefined(oid) && oid.startsWith('1.3.6.1.4.1.25623.1.0.') && ( + {isDefined(oid) && oid.startsWith(DEFAULT_OID_VALUE) && ( {renderNvtName(oid, nvt.name)} From 5cd62e930c752b559655a7b94426d0da512f4ff5 Mon Sep 17 00:00:00 2001 From: Steffen Waterkamp Date: Wed, 19 Feb 2020 10:33:33 +0100 Subject: [PATCH 2/2] Update Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8673e4e6bf..50f1d6cac9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Display timezone for session timeout in user menu [#1764](https://github.com/greenbone/gsa/pull/1764) ### Changed +- Adjusted DEFAULT_OID_VALUE for use with new oid scheme [#1974](https://github.com/greenbone/gsa/pull/1974) - Made delta report diffs more explicit [#1950](https://github.com/greenbone/gsa/pull/1950) - Changed default port to 22 for scanner dialog [#1768](https://github.com/greenbone/gsa/pull/1768) - Improved Delta Report Details [#1748](https://github.com/greenbone/gsa/pull/1748)