summaryrefslogtreecommitdiffstats
path: root/openo-portal/portal-lifecyclemgr
diff options
context:
space:
mode:
authorLuji7 <lu.ji3@zte.com.cn>2016-11-01 18:06:07 +0800
committerLuji <lu.ji3@zte.com.cn>2016-11-02 01:03:43 +0000
commita4593cc4d9e301b5e7c05101a9f7d621f35c9c58 (patch)
tree28308d56c512b6d1f4973614036826e947a6f800 /openo-portal/portal-lifecyclemgr
parent1bff71da2f12880a8d6d9c36441725f781275392 (diff)
Issue-Id: GSO-80 display name instead of description
Change-Id: I63d2e32e9a6e7e5bd8293c272d0f55742b5ba679 Signed-off-by: Luji7 <lu.ji3@zte.com.cn> (cherry picked from commit 8830ec8dfaee75c2ac0c7a11d382ce1e6a2e6ec6)
Diffstat (limited to 'openo-portal/portal-lifecyclemgr')
-rw-r--r--openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js19
1 files changed, 16 insertions, 3 deletions
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 022069ce..09157cc4 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
@@ -152,7 +152,11 @@ function fetchGsoTemplateInputParameters(templateId) {
fetchSdnController()
).then(
function (templateParameterResponse, nestingTempatesParas, vimInfoResponse, sdnControllersResponse) {
- var inputParas = concat(templateParameterResponse[0].inputs, nestingTempatesParas);
+ var inputs = templateParameterResponse[0].inputs.map(function(input) {
+ input.showName = input.name;
+ return input;
+ });
+ var inputParas = concat(inputs, nestingTempatesParas);
var vims = translateToVimInfo(vimInfoResponse[0]);
var sdnControllers = translateToSdnControllers(sdnControllersResponse[0]);
templateParameters = translateToTemplateParameters(inputParas, vims, sdnControllers);
@@ -279,7 +283,8 @@ function translateToTemplateParameters(inputs, vims, controllers) {
defaultValue: inputs[i].defaultValue,
required: inputs[i].required,
id: 'parameters_' + i,
- value: inputs[i].defaultValue || ''
+ value: inputs[i].defaultValue || '',
+ showName: inputs[i].showName
};
}
return {changed: false, parameters: inputParameters, vimInfos: vims, sdnControllers: controllers};
@@ -296,6 +301,10 @@ function fetchNfvoTemplateInputParameters(templateId) {
var vims = translateToVimInfo(vimInfoResponse[0]);
var sdnControllers = translateToSdnControllers(sdnControllerResponse[0]);
var inputParas = templateParameterResponse[0].inputs;
+ inputParas = inputParas.map(function(input) {
+ input.showName = input.name;
+ return input;
+ });
inputParas.push({
name: 'location',
type: 'location',
@@ -323,7 +332,11 @@ function fetchSdnoTemplateInputParameters(templateId) {
fetchTemplateParameterDefinitions(templateId)
).then(
function (templateParameterResponse) {
- templateParameters = translateToTemplateParameters(templateParameterResponse.inputs, [], []);
+ var inputs = templateParameterResponse.inputs.map(function(input) {
+ input.showName = input.name;
+ return input;
+ })
+ templateParameters = translateToTemplateParameters(inputs, [], []);
defer.resolve(templateParameters);
}
);