Merge branch 'gsa-8.0' into filtergroup_tests_gsa8

greenbone · May 20, 2019 · 5da8608 · 5da8608
2 parents 207277e + 1537123
commit 5da8608
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -51,6 +51,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Cleanup get_report function in gsad [#1263](https://github.com/greenbone/gsa/pull/1263)
 
 ### Fixed
+- Don't crash if second result for delta is undefined [#1418](https://github.com/greenbone/gsa/pull/1418)
 - Fix xml decoding issues with fast-xml-parser [#1414](https://github.com/greenbone/gsa/pull/1414)
 - Fix translation for task status and task trend tooltip [#1409](https://github.com/greenbone/gsa/pull/1409)
 - Fix problems with German translation in Add Dashboard dialog, SolutionTypeGroup and SeverityClassLabel [#1412](https://github.com/greenbone/gsa/pull/1412)

diff --git a/gsa/src/web/pages/results/details.js b/gsa/src/web/pages/results/details.js
@@ -71,6 +71,11 @@ const ResultDetails = ({className, links = true, entity}) => {
     ? result.detection.result.details
     : undefined;
 
+  const result2 = result.delta.result;
+  const result2Description = isDefined(result2)
+    ? result2.description
+    : undefined;
+
   return (
     <Layout flex="column" grow="1" className={className}>
       <DetailsBlock title={_('Summary')}>
@@ -85,7 +90,7 @@ const ResultDetails = ({className, links = true, entity}) => {
           </div>
           <div>
             <h3>Result 2</h3>
-            <Pre>{result.delta.result.description}</Pre>
+            <Pre>{result2Description}</Pre>
           </div>
           <div>
             <h3>Different Lines</h3>