From 5ab16f857b30fb42d94af55b0fe30b1639478815 Mon Sep 17 00:00:00 2001
From: "Determe, Sebastien (sd378r)" <sebastien.determe@intl.att.com>
Date: Tue, 28 May 2019 15:08:56 +0200
Subject: [PATCH] Rename a field

Rename a field in policy payload, resourceId must be resourceID

Issue-ID: CLAMP-395
Change-Id: Ic890b470b8f5c8f4962d65c7388f9c471f7c5b5d
Signed-off-by: Determe, Sebastien (sd378r) <sebastien.determe@intl.att.com>
---
 .../partials/portfolios/operational_policy_window.html         |  4 ++--
 .../resources/designer/scripts/OperationalPolicyCtrl.js        | 10 +++++-----
 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 3e958668..9eb6c3b6 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 95fc4203..55db5e79 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"]));
 				    }
 			    }
 		    }
-- 
2.16.6