Policy 1707 Second commit

Change-Id: I18f5b142238733d17280cf17c3d1dd28204d34e9
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>

3 files changed, 22 insertions, 3 deletions

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTermListDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTermListDictController.js
index 4c3ddb4ab..be2f7449b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTermListDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/FWTermListDictController.js
@@ -25,6 +25,8 @@ app.controller('editFWTermListController' , function ($scope, $modalInstance, me
      $scope.sourceServicechoices = [];
      $scope.destinationServicechoices = [];
      $scope.actionListchoices = [];
+     $scope.groupAddresses=[];
+     $scope.groupServices=[];
     if(message.termListDictionaryData==null){
         $scope.label='Add Term List Name'
     }else{
@@ -143,6 +145,10 @@ app.controller('editFWTermListController' , function ($scope, $modalInstance, me
     	console.log($scope.data);
     	$scope.prefixListDictionaryDatas = JSON.parse($scope.data.prefixListDictionaryDatas);
     	console.log($scope.prefixListDictionaryDatas);
+    	for(i = 0; i < $scope.prefixListDictionaryDatas.length; i++){
+			var key  = $scope.prefixListDictionaryDatas[i];
+			$scope.groupAddresses.push(key);
+		}
     }, function (error) {
     	console.log("failed");
     });
@@ -163,6 +169,10 @@ app.controller('editFWTermListController' , function ($scope, $modalInstance, me
     	console.log($scope.data);
     	$scope.addressGroupDictionaryDatas = JSON.parse($scope.data.addressGroupDictionaryDatas);
     	console.log($scope.addressGroupDictionaryDatas);
+    	for(i = 0; i < $scope.addressGroupDictionaryDatas.length; i++){
+			var key  = $scope.addressGroupDictionaryDatas[i];
+			$scope.groupAddresses.push(key);
+		}
     }, function (error) {
     	console.log("failed");
     });
@@ -173,6 +183,10 @@ app.controller('editFWTermListController' , function ($scope, $modalInstance, me
     	console.log($scope.data);
     	$scope.serviceListDictionaryDatas = JSON.parse($scope.data.serviceListDictionaryDatas);
     	console.log($scope.serviceListDictionaryDatas);
+    	for(i = 0; i < $scope.serviceListDictionaryDatas.length; i++){
+			var key  = $scope.serviceListDictionaryDatas[i];
+			$scope.groupServices.push(key);
+		}
     }, function (error) {
     	console.log("failed");
     });
@@ -183,6 +197,10 @@ app.controller('editFWTermListController' , function ($scope, $modalInstance, me
     	console.log($scope.data);
     	$scope.serviceGroupDictionaryDatas = JSON.parse($scope.data.serviceGroupDictionaryDatas);
     	console.log($scope.serviceGroupDictionaryDatas);
+    	for(i = 0; i < $scope.serviceGroupDictionaryDatas.length; i++){
+			var key  = $scope.serviceGroupDictionaryDatas[i];
+			$scope.groupServices.push(key);
+		}
     }, function (error) {
     	console.log("failed");
     });
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSModelsDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSModelsDictController.js
index 2e30523ad..67b68eca8 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSModelsDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSModelsDictController.js
@@ -37,7 +37,7 @@ app.controller('editMSModelController' ,  function ($scope, $modalInstance, mess
 
     $scope.uploadFile = function(files) {
     	var extn = files[0].name.substr(files[0].name.lastIndexOf('.')+1);
-    	if(extn == 'zip' || extn == 'xmi'){
+    	if(extn == 'zip' || extn == 'xmi'||  extn == 'yml'){
     		valid = true;
     		var fd = new FormData();
     		fd.append("file", files[0]);
@@ -51,6 +51,7 @@ app.controller('editMSModelController' ,  function ($scope, $modalInstance, mess
                 }else{      
                 	$scope.classListDatas=data.classListDatas;
                 	$scope.modalDatas = data.modelDatas;
+                	$scope.modelType= data.modelType;
                 	console.log($scope.classListDatas);
                 }
             }).error( );
@@ -64,7 +65,7 @@ app.controller('editMSModelController' ,  function ($scope, $modalInstance, mess
     $scope.saveMSModel = function(microServiceModelsDictionaryData) {
     	if(valid){
     		 var uuu = "saveDictionary/ms_dictionary/save_model";
-    	        var postData={microServiceModelsDictionaryData: microServiceModelsDictionaryData, userid: userid, classMap: $scope.modalDatas};
+    	        var postData={microServiceModelsDictionaryData: microServiceModelsDictionaryData, userid: userid, classMap: $scope.modalDatas,modelType:$scope.modelType};
     	        $.ajax({
     	            type : 'POST',
     	            url : uuu,
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/policyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/policyController.js
index ec6a56c05..4699512be 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/policyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/policyController.js
@@ -55,7 +55,7 @@ app.config(function($routeProvider) {
 	})
 	.when('/policy_SearchFilter', {
 		templateUrl: 'app/policyApp/policy-models/policy_SearchFilter.html',
-		controller : "PolicyManagerController"
+		controller : "PolicySearchController"
 	})
 	.otherwise({
 		templateUrl:'app/policyApp/policy-models/Editor/templates/policyEditor.html',