diff options
| author |   Sébastien Determe <sebastien.determe@intl.att.com> | 2019-05-28 13:24:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-28 13:24:53 +0000 |
| commit | f0835c089d548f4020b4ebebc271d815ba930786 (patch) | |
| tree | 56639eb6e85626ed1037d5b3b45e3f33ea0432e5 /src/main | |
| parent | 16587feaf8d57ea025a8d6260f88c85d7b8c4666 (diff) | |
| parent | 5ab16f857b30fb42d94af55b0fe30b1639478815 (diff) | |
Merge "Rename a field"
Diffstat (limited to 'src/main')
2 files changed, 7 insertions, 7 deletions
diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html index 3e9586685..9eb6c3b66 100644 --- a/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html +++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html @@ -310,10 +310,10 @@ label { </div> </div> <div class="form-group clearfix"> - <label for="resourceId" class="col-sm-4 control-label"> + <label for="resourceID" class="col-sm-4 control-label"> Target ResourceId</label> <div class="col-sm-8"> - <select class="form-control" name="resourceId" id="resourceId" + <select class="form-control" name="resourceID" id="resourceID" enableFilter="true" ng-click="changeTargetResourceId($event)" ng-model="resourceId"> <option value="">-- choose an option --</option> diff --git a/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js index 95fc42038..55db5e798 100644 --- a/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js +++ b/src/main/resources/META-INF/resources/designer/scripts/OperationalPolicyCtrl.js @@ -234,14 +234,14 @@ app } function initTargetResourceIdOptions (targetType, formNum) { var recipe = $("#formId" + formNum + "#recipe").val(); - $("#formId" + formNum + " #resourceId").empty(); - $("#formId" + formNum + " #resourceId").append($('<option></option>').val("").html("-- choose an option --")); + $("#formId" + formNum + " #resourceID").empty(); + $("#formId" + formNum + " #resourceID").append($('<option></option>').val("").html("-- choose an option --")); var resourceVnf = getResourceDetailsVfProperty(); if (targetType == "VNF" && (null !== resourceVnf || undefined !== resourceVnf)) { for ( var prop in resourceVnf) { var name = resourceVnf[prop]["name"]; - $("#formId" + formNum + " #resourceId").append($('<option></option>').val(name).html(name)); + $("#formId" + formNum + " #resourceID").append($('<option></option>').val(name).html(name)); } } var resourceVFModule = getResourceDetailsVfModuleProperty(); @@ -249,12 +249,12 @@ app if (recipe == 'VF Module Create' || recipe == 'VF Module Delete') { for ( var prop in resourceVFModule) { if (resourceVFModule[prop]["isBase"] == false) { - $("#formId" + formNum + " #resourceId").append($('<option></option>').val(resourceVFModule[prop]["vfModuleModelName"]).html(resourceVFModule[prop]["vfModuleModelName"])); + $("#formId" + formNum + " #resourceID").append($('<option></option>').val(resourceVFModule[prop]["vfModuleModelName"]).html(resourceVFModule[prop]["vfModuleModelName"])); } } } else { for ( var prop in resourceVFModule) { - $("#formId" + formNum + " #resourceId").append($('<option></option>').val(resourceVFModule[prop]["vfModuleModelName"]).html(resourceVFModule[prop]["vfModuleModelName"])); + $("#formId" + formNum + " #resourceID").append($('<option></option>').val(resourceVFModule[prop]["vfModuleModelName"]).html(resourceVFModule[prop]["vfModuleModelName"])); } } } |