Merge "Issue-Id: GSO-80 display name instead of description" into sun

1 files changed, 3 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 f17815cd..9105d5d6 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
@@ -387,7 +387,7 @@ function transformToComponents(templateParas) {
 function generateComboxComponent(inputPara, items) {
     var component = '<div class="form-group" style="margin-left:25px;margin-bottom:15px;">' +
         '<label class="col-sm-3 control-label">' +
-        '<span>'+ inputPara.description +'</span>' +
+        '<span>'+ inputPara.name +'</span>' +
         '<span class="required">*</span>' +
         '</label>' +
         '<div class="col-sm-7">' +
@@ -411,11 +411,11 @@ function transformToOptions(items) {
 function generateComponent(inputPara) {
 	var component = '<div class="mT15 form-group" style="margin-left:25px;">' +
             '<label class="col-sm-3 control-label">' +
-            '<span>' + inputPara.description + '</span>' + generateRequiredLabel(inputPara) +
+            '<span>' + inputPara.name + '</span>' + generateRequiredLabel(inputPara) +
             '</label>' +
             '<div class="col-sm-7">' +
             '<input type="text" id="' + inputPara.id + '" name="parameter description" class="form-control" placeholder="' +
-            inputPara.description + '" value="' + inputPara.value + '" />' +
+            inputPara.name + '" value="' + inputPara.value + '" />' +
             '</div></div>';
     return component;
 }