From fa92c703fe15864a83aa01652a184c1bc8529d8b Mon Sep 17 00:00:00 2001 From: Luji7 Date: Thu, 3 Nov 2016 14:39:11 +0800 Subject: [PATCH] Issue-Id: GSO-88 Fix parameter display error Change-Id: I2b57814a575de2a51a9004c36fe551fb404ac1c5 Signed-off-by: Luji7 --- .../portal-lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html | 2 +- .../portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html index d33975fd..5d75323f 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/InputData.html @@ -59,7 +59,7 @@ } } else{ - var nameObj = {i18nKey:key,showName:key}; + var nameObj = {name:key,showName:key}; name = showName(nameObj); } $("body").append('
'); diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js index c78d3c2b..ee9ae621 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js @@ -483,7 +483,7 @@ function generateComponent(inputPara) { } function showName(inputPara) { - var name = $.i18n.prop(inputPara.i18nKey) + var name = $.i18n.prop(inputPara.name) if(name.length === 0 || name.slice(0, 1) === '[') { name = inputPara.showName; } -- 2.16.6