X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-FE-common%2Fclient%2Fapp%2Fviews%2Frole%2FrolefunctionpopupController.js;h=412415006c0c814db439b3437503f0837a422e98;hb=978dbcf0a196acbafad72fe1e2478ec0e384f02f;hp=db5bb1b6d63e149e20884534563dfba5bb5d40f0;hpb=bc7350dce5b7b1dcd1c472a3922b42c4ea99809d;p=portal.git

diff --git a/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js b/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js
index db5bb1b6..41241500 100644
--- a/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js
+++ b/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js
@@ -17,79 +17,85 @@
  * limitations under the License.
  * ================================================================================
  */
-app.controller('rolefunctionpopupController', function ($scope, confirmBoxService, message, $http,RoleService, conf, isEditing){
-				if(message.availableRoleFunction==null) {
-					$scope.label='Add Role Function';
-					var tempText = "";
-				}
-				else{
-					$scope.label='Edit Role Function'
-					$scope.disableCd=true;
-					var tempText = new String(message.availableRoleFunction.name);
-					$scope.editRoleFunction = angular.copy(message.availableRoleFunction);
-				}
-				
-				$scope.tempText = tempText;
-				$scope.isEditing = isEditing;
-				
-				$scope.saveRoleFunction = function(availableRoleFunction) {
-					  var uuu = conf.api.saveRoleFunction;
-					  var postData={availableRoleFunction: availableRoleFunction};
+app.controller('rolefunctionpopupController',function($scope, confirmBoxService, message, $http,RoleService, conf, isEditing) {
+					if (message.availableRoleFunction == null) {
+						$scope.label = 'Add Role Function';
+						var tempText = "";
+					} else {
+						$scope.label = 'Edit Role Function'
+						$scope.disableCd = true;
+						var tempText = new String(message.availableRoleFunction.name);
+						$scope.editRoleFunction = angular.copy(message.availableRoleFunction);
+					}
 
-					  if(availableRoleFunction==null){
-						  confirmBoxService.showInformation("Please enter valid role function details.");
-					  }
-					  var exists = false,x;
-					  for(x in message.availableRoleFunctions){
-						  console.log(message.availableRoleFunctions[x].name);
-							if(message.availableRoleFunctions[x].name==availableRoleFunction.name){
-								confirmBoxService.showInformation("Role Function already exists.");
-								exists = true;
-								availableRoleFunction.name = $scope.tempText;
-								break;
-							} 
-							if(!isEditing){
-								if (message.availableRoleFunctions[x].code == availableRoleFunction.code) {
-									confirmBoxService.showInformation("Code already exists. Please create a role function with a different code to proceed.");
-									exists = true;
-									availableRoleFunction.name = $scope.tempText;
-									break;
-								}
-							}
-					  }
-					  
-					  if(!exists && availableRoleFunction.name.trim() != '' && availableRoleFunction.code.trim() != ''){
-			              $http.post(uuu, JSON.stringify(postData)).then(function(res){
-			            	  console.log("data");
-//			            	  console.log(res.data);
-//			            	  $scope.availableRoleFunctionsTemp = res.data.availableRoleFunctions;
-			            	  RoleService.getRoleFunctionList().then(function(data){
-			            			
-			            			var j = data;
-			            	  		$scope.data = JSON.parse(j.data);
-			            	  		$scope.availableRoleFunctions =JSON.parse($scope.data.availableRoleFunctions);
-			            	  		
-			            	  		//$scope.resetMenu();
-			            	  		$scope.closeThisDialog({result: true, availableRoleFunctions: $scope.availableRoleFunctions });
-			            		},function(error){
-			            			console.log("failed");
-			            			//reloadPageOnce();
-			            			$scope.closeThisDialog(true);		            			
-			            		});
-			            	  
-			            	  
-			              });						  
-						  
-						  
-						  
-						  
-						}
-				};
-					  
-				  	  
-					
-				$scope.close = function() { 
-					this.closeThisDialog(true);
-				};
-}
-);
+					$scope.tempText = tempText;
+					$scope.isEditing = isEditing;
+
+					$scope.saveRoleFunction = function(availableRoleFunction) {
+						confirmBoxService.confirm(
+										"You are about to Create the role function "+ availableRoleFunction.name+ ". Do you want to continue?")
+								.then(function(confirmed) {
+											if (confirmed) {
+
+												var uuu = conf.api.saveRoleFunction;
+												var postData = availableRoleFunction;
+
+												if (availableRoleFunction == null) {
+													confirmBoxService.showInformation("Please enter valid role function details.");
+												}
+												var exists = false, x;
+												for (x in message.availableRoleFunctions) {
+													console.log(message.availableRoleFunctions[x].name);
+													if (message.availableRoleFunctions[x].name == availableRoleFunction.name) {
+														confirmBoxService.showInformation("Role Function already exists.");
+														exists = true;
+														availableRoleFunction.name = $scope.tempText;
+														break;
+													}
+													if (!isEditing) {
+														if (message.availableRoleFunctions[x].code == availableRoleFunction.code) {
+															confirmBoxService.showInformation("Code already exists. Please create a role function with a different code to proceed.");
+															exists = true;
+															availableRoleFunction.name = $scope.tempText;
+															break;
+														}
+													}
+												}
+
+												if (!exists&& availableRoleFunction.name.trim() != ''&& availableRoleFunction.code.trim() != '') {
+													$http.post(uuu,JSON.stringify(postData)).then(function(res) {
+																		$scope.availableRoleFunctionsTemp = res.data.availableRoleFunctions;
+																		RoleService.getRoleFunctionList().then(
+																						function(data) {
+
+																							var j = data;
+																							$scope.data = JSON.parse(j.data);
+																							$scope.availableRoleFunctions = JSON.parse($scope.data.availableRoleFunctions);
+
+																							// $scope.resetMenu();
+																							/*$scope.closeThisDialog({
+																										result : true,
+																										availableRoleFunctions : $scope.availableRoleFunctions
+																									});*/
+																							$scope.$dismiss({result : true,availableRoleFunctions : $scope.availableRoleFunctions});
+																						},
+																						function(error) {
+																							console.log("failed");
+																							// reloadPageOnce();
+																							//$scope.closeThisDialog(true);
+																							$scope.$dismiss('cancel');
+																						});
+
+																	});
+
+												}
+											};
+
+											$scope.close = function() {
+												this.closeThisDialog(true);
+											};
+										}
+
+								);
+					}
+				});
\ No newline at end of file