From 36e8f5e2c625cd76f183757942db9a80a30251ab Mon Sep 17 00:00:00 2001 From: "Wang,Frank(gw1218)" Date: Thu, 12 Apr 2018 11:59:00 -0500 Subject: Fix Wrong Data Names Fix wrong data names due to reponse changes Issue-ID: POLICY-740 Change-Id: I28db745f88ccecd67f3daa30adf70cc69645b496 Signed-off-by: Wang,Frank(gw1218) --- .../dictionaryController/MSHeaderDefaultValuesDictController.js | 7 ++++--- .../MSHeaderDefaultValuesDictGridController.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'POLICY-SDK-APP/src/main/webapp/app/policyApp/controller') diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSHeaderDefaultValuesDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSHeaderDefaultValuesDictController.js index 883ac2508..960d76bd4 100644 --- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSHeaderDefaultValuesDictController.js +++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSHeaderDefaultValuesDictController.js @@ -112,12 +112,13 @@ app.controller('editMSHeaderDefaultValuesController' , function ($scope, $modal data: JSON.stringify(postData), success : function(data){ $scope.$apply(function(){ - $scope.microServiceAttributeDictionaryDatas=data.microServiceHeaderDefaultDatas;}); + $scope.microServiceHeaderDefaultDatas=data.microServiceHeaderDefaultDatas;}); + console.log("microServiceHeaderDefaultDatas returned after saved: " + $scope.microServiceHeaderDefaultDatas); if($scope.microServiceAttributeDictionaryDatas == "Duplicate"){ Notification.error("Model Attribute Dictionary exists with Same Attribute Name.") }else{ - console.log($scope.microServiceAttributeDictionaryDatas); - $modalInstance.close({microServiceAttributeDictionaryDatas:$scope.microServiceAttributeDictionaryDatas}); + console.log($scope.microServiceHeaderDefaultDatas); + $modalInstance.close({microServiceHeaderDefaultDatas:$scope.microServiceHeaderDefaultDatas}); } }, error : function(data){ diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSHeaderDefaultValuesDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSHeaderDefaultValuesDictGridController.js index 5a86c14d5..4e6b9696b 100644 --- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSHeaderDefaultValuesDictGridController.js +++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/MSHeaderDefaultValuesDictGridController.js @@ -143,7 +143,7 @@ app.controller('msHeaderDefaultValuesDictGridController', function ($scope, Poli }; $scope.deleteModelAttribute = function(data) { - modalService.popupConfirmWin("Confirm","You are about to delete the Header Default Values : "+data.name+". Do you want to continue?", + modalService.popupConfirmWin("Confirm","You are about to delete the Header Default Values : "+data.modelName+". Do you want to continue?", function(){ var uuu = "deleteDictionary/ms_dictionary/remove_headerDefaults"; var postData={data: data}; -- cgit 1.2.3-korg