aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com>2017-11-01 15:07:19 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-01 15:07:19 +0000
commit2f6228f6d3b0201ac864e85b8cf6d30fc16fa380 (patch)
treeb4f6c2cd6060977123963922addef40311fb669a
parentb003ccf736694173af6a57864342946cbc276d7b (diff)
parentdee95858c15519e28bd08b6e327fa81682a54dfe (diff)
Merge "confirmation msg for delete FG doesn't appear"
-rw-r--r--openecomp-ui/src/nfvo-components/modal/GlobalModal.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
index f282046125..4e7a1a16a4 100644
--- a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
+++ b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js
@@ -114,7 +114,9 @@ export class GlobalModalView extends React.Component {
<Modal.Body>
{ComponentToRender ?
<ComponentToRender {...modalComponentProps}/> :
- <div> {msg && msg.split('\n').map(txt => <span> {txt} <br/> </span>)} </div>
+ msg && typeof msg === 'string' ?
+ <div> {msg.split('\n').map(txt => <span> {txt} <br/> </span>)} </div> :
+ msg
}
</Modal.Body>
{(onConfirmed || onDeclined || type !== typeEnum.DEFAULT) &&