X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fwebapp%2Fapp%2FpolicyApp%2Fpolicy-models%2FEditor%2FPolicyTemplateController%2FActionPolicyController.js;h=398b285e69a77fb9ca28cbe2f4cc8eea2ddf868c;hb=fc5c07705edc4dcb7083b39116a43844bb6a1490;hp=fde8d4e9ee483d5dd002667b9f21680580b39e6a;hpb=e0addf5b588a1244f9679becd90999dfcb4c3a94;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ActionPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ActionPolicyController.js
index fde8d4e9e..398b285e6 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ActionPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ActionPolicyController.js
@@ -17,12 +17,25 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-angular.module('abs').controller('actionPolicyController', function ($scope, PolicyAppService, modalService, $modal, Notification) {
+app.controller('actionPolicyController', ['$scope', 'PolicyAppService', 'policyNavigator', 'modalService', '$modal', 'Notification', function ($scope, PolicyAppService, PolicyNavigator, modalService, $modal, Notification) {
     $("#dialog").hide();
     
+    $scope.policyNavigator;
     $scope.savebutton = true;
-    $scope.finalPath = null;
-		
+    $scope.refreshCheck = false;
+	
+    $scope.refresh = function(){
+    	if($scope.refreshCheck){
+    		$scope.policyNavigator.refresh();
+    	}
+    	$scope.modal('createNewPolicy', true);
+    	$scope.temp.policy = "";
+    };
+    
+    $scope.modal = function(id, hide) {
+        return $('#' + id).modal(hide ? 'hide' : 'show');
+    };
+    
     PolicyAppService.getData('getDictionary/get_ActionPolicyDictDataByName').then(function (data) {
     	var j = data;
     	$scope.data = JSON.parse(j.data);
@@ -61,7 +74,11 @@ angular.module('abs').controller('actionPolicyController', function ($scope, Pol
     }
     
     $scope.saveActionPolicy = function(policy){
-        console.log(policy);
+    	if(policy.itemContent != undefined){
+    		$scope.refreshCheck = true; 
+        	$scope.policyNavigator = policy.itemContent;
+        	policy.itemContent = "";
+    	}
         $scope.savebutton = false;
         var uuu = "policycreation/save_policy";
 		var postData={policyData: policy};
@@ -82,7 +99,6 @@ angular.module('abs').controller('actionPolicyController', function ($scope, Pol
 						Notification.error("Policy Already Exists with Same Name in Scope.");
 					}
 				});
-				console.log($scope.data);
 			},
 			error : function(data){
 				Notification.error("Error Occured while saving Policy.");
@@ -92,9 +108,8 @@ angular.module('abs').controller('actionPolicyController', function ($scope, Pol
     };
 
     $scope.validatePolicy = function(policy){
-    	console.log(policy);
     	document.getElementById("validate").innerHTML = "";
-         var uuu = "policyController/validate_policy.htm";
+        var uuu = "policyController/validate_policy.htm";
  		var postData={policyData: policy};
  		$.ajax({
  			type : 'POST',
@@ -118,7 +133,6 @@ angular.module('abs').controller('actionPolicyController', function ($scope, Pol
  						}
  						
  				});
- 				console.log($scope.data);
  			},
  			error : function(data){
  				Notification.error("Validation Failed.");
@@ -129,6 +143,7 @@ angular.module('abs').controller('actionPolicyController', function ($scope, Pol
 
     if(!$scope.temp.policy.editPolicy && !$scope.temp.policy.readOnly){
     	$scope.temp.policy.attributes = [];
+    	$scope.temp.policy.attributes.push({'id':'choice'+1});
     	 $scope.temp.policy.ruleAlgorithmschoices = [];
     }else{
 	   if($scope.temp.policy.attributes.length == 0){
@@ -170,4 +185,4 @@ angular.module('abs').controller('actionPolicyController', function ($scope, Pol
       $scope.temp.policy.ruleAlgorithmschoices.splice(lastItem);
     };
     
-});
\ No newline at end of file
+}]);
\ No newline at end of file