X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-FE-common%2Fclient%2Fapp%2Fviews%2Frole%2FrolepopupmodelController.js;h=1176e50adcea506fa8cb9ff9e52680a268bd0a65;hb=refs%2Fchanges%2F85%2F4985%2F2;hp=7feb7f2f71766a7503bbb9f94648d969832a29b4;hpb=ba838f2e13f1e8050c75e68bd3733d56d8f416d5;p=portal.git

diff --git a/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js b/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js
index 7feb7f2f..1176e50a 100644
--- a/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js
+++ b/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js
@@ -1,251 +1,251 @@
-/*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ================================================================================
- */
-app.controller('rolepopupController',  function ($scope, role, roleId, confirmBoxService, $http, $state, availableRoles, conf, availableRoleFunctions,ngDialog){
-	
-	  		$scope.role = role;
-	  		console.log($scope.role);
-	  		if($scope.role.childRoles==null){
-	  			$scope.role.childRoles=[];
-	  		}
-	  		
-	  		$scope.ociavailableRoles=availableRoles;
-	  		console.log($scope.ociavailableRoles);
-	  		
-	  		$scope.availableRoles=[];
-	  		if($scope.ociavailableRoles)
-	  			$.each($scope.ociavailableRoles, function(i, a){ 
-	  				var availableRole = a;
-	  				availableRole.selected = false;
-	  				if($scope.role.childRoles){
-	  			    $.each($scope.role.childRoles, function(j, b){ 
-	  			    	if(a.id === b.id) {
-	  			    		availableRole.selected = true;
-	  			    	}
-	  			    });
-	  				};
-	  			    $scope.availableRoles.push(availableRole);	    
-	  			});	
-	  			
-	  		$scope.ociavailableRoleFunctions = availableRoleFunctions; 
-	  		console.log($scope.ociavailableRoleFunctions);
-	  		$scope.availableRoleFunctions = []; 
-	  		if($scope.ociavailableRoleFunctions)
-	  			$.each($scope.ociavailableRoleFunctions, function(i, a){ 
-	  				var availableRoleFunction = a;
-	  				availableRoleFunction.selected = false;
-	  			    $.each($scope.role.roleFunctions, function(j, b){ 
-	  			    	if(a.code === b.code) {
-	  			    		availableRoleFunction.selected = true;
-	  			    	}
-	  			    });
-	  			    $scope.availableRoleFunctions.push(availableRoleFunction);	    
-	  		});
-	  		//$scope.resetMenu();
-		
-		$scope.toggleRoleFunction = function(selected,availableRoleFunction) {
-			//alert('toggleRole: '+selected);
-			 
-			if(!selected) {
-				//remove role function
-				if(role.id==null){
-					var index = $scope.role.roleFunctions.indexOf(availableRoleFunction);
-				 	if(index>=0)
-						$scope.role.roleFunctions.splice(index, 1);
-					return;
-				}
-				var uuu = conf.api.toggleRoleRoleFunction + "?role_id=" + roleId;
-				confirmBoxService.confirm("You are about to remove the role function "+availableRoleFunction.name+" from the role for "+$scope.role.name+". Do you want to continue?").then(
-		    			function(confirmed){
-		    					if(confirmed) {	
-								var postData={roleFunction:availableRoleFunction};
-								$http.post(uuu, postData).then(
-										function(response) {
-											$scope.role= response.data.role;
-										}, 
-										function(response) {
-											confirmBoxService.showInformation("Error while saving.");
-										}
-								);
-									
-									
-									
-									
-								}
-		    					 else {
-		    						 availableRoleFunction.selected=!availableRoleFunction.selected;
-			    				 }
-								/*
-							  	  $.ajax({
-							  		 type : 'POST',
-							  		 url : uuu,
-							  		 dataType: 'json',
-							  		 contentType: 'application/json',
-							  		 data: JSON.stringify(postData),
-							  		 success : function(data){
-							  			$scope.$apply(function(){$scope.role=data.role;}); 
-									 },
-									 error : function(data){
-										 modalService.showFailure("Fail","Error while saving.");
-									 }
-							  	  });
-							  	  */
-		    			});
-	
-			} else {
-				//add role function
-				if(role.id==null){
-					$scope.role.roleFunctions.push(availableRoleFunction);
-					return;
-				}
-				var uuu = conf.api.addRoleRoleFunction + "?role_id=" + roleId;
-				
-				confirmBoxService.confirm("You are about to add the role function "+availableRoleFunction.name+" to the role for "+$scope.role.name+". Do you want to continue?").then(
-		    			function(confirmed){
-		    				if(confirmed) {
-								  var postData={roleFunction:availableRoleFunction};
-								  $http.post(uuu,postData).then( function(response) {
-									  $scope.role=response.data.role;
-									  },
-									  
-									  function(data) {
-										  confirmBoxService.showInformation("Error while saving.");
-									  });
-							} else {
-									  availableRoleFunction.selected=!availableRoleFunction.selected;
-							}
-									/*		  
-								  	  $.ajax({
-								  		 type : 'POST',
-								  		 url : uuu,
-								  		 dataType: 'json',
-								  		 contentType: 'application/json',
-								  		 data: JSON.stringify(postData),
-								  		 success : function(data){
-								  			$scope.$apply(function(){$scope.role=data.role;}); 
-										 },
-										 error : function(data){
-											 modalService.showFailure("Fail","Error while saving.");
-										 }
-								  	  });
-								  	  
-									
-						    	},
-						    	function(){
-						    		availableRoleFunction.selected=!availableRoleFunction.selected;
-						    	})*/
-			});
-			
-			  
-	}
-		};
-	
-	$scope.toggleChildRole = function(selected,availableRole) {
-		//alert('toggleRole: '+selected);
-
-		if(!selected) {
-			//remove role
-			if(role.id==null){
-				var index = $scope.role.childRoles.indexOf(availableRole);
-			 	if(index>=0)
-					$scope.role.childRoles.splice(index, 1);
-				return;
-			}
-			var uuu = conf.api.toggleRoleChildRole +"?role_id=" + roleId;
-			
-			confirmBoxService.confirm("You are about to remove the child role "+availableRole.name+" from the role for "+$scope.role.name+". Do you want to continue?").then(
-	    			function(confirmed){
-	    				if(confirmed) {
-	    			
-						var postData={childRole:availableRole};
-						 $http.post(uuu,postData).then(function(response) {
-							  $scope.role=response.data.role;
-							  },
-							  function(data) {
-								  confirmBoxService.showInformation("Error while saving.");
-							  });
-						  } else {
-							  availableRole.selected=false;
-						  }
-	    			});
-					  	 /* $.ajax({
-					  		 type : 'POST',
-					  		 url : uuu,
-					  		 dataType: 'json',
-					  		 contentType: 'application/json',
-					  		 data: JSON.stringify(postData),
-					  		 success : function(data){
-					  			 console.log('role',data.role);
-					  			 $scope.$apply(function(){$scope.role=data.role;}); 
-							 },
-							 error : function(data){
-								 modalService.showFailure("Fail","Error while saving.");
-							 }
-					  	  });
-					  	  */
-				
-	    	
-		} else {
-			//add role
-			if(role.id==null){
-				$scope.role.childRoles.push(availableRole);
-				return;
-			}
-			var uuu = conf.api.addRoleChildRole +"?role_id=" + roleId;
-			
-			confirmBoxService.confirm("You are about to add the child role "+availableRole.name+" to the role for "+$scope.role.name+". Do you want to continue?").then(
-	    			function(confirmed){
-	    				if(confirmed) {
-						  var postData={childRole:availableRole};
-						  $http.post(uuu,postData).then(function(response) {
-							  $scope.role=response.data.role;
-							  },
-							  function(data) {
-								  confirmBoxService.showInformation("Error while saving.");
-							  });
-						  } else {
-							  availableRole.selected=false;
-						  }
-			  	 /* $.ajax({
-			  		 type : 'POST',
-			  		 url : uuu,
-			  		 dataType: 'json',
-			  		 contentType: 'application/json',
-			  		 data: JSON.stringify(postData),
-			  		 success : function(data){
-			  			$scope.$apply(function(){$scope.role=data.role;}); 
-					 },
-					 error : function(data){
-						 modalService.showFailure("Fail","Error while saving.");
-					 }
-			  	});*/
-				
-	    	});
-		
-		  
-	}
-	};
-	
-	$scope.close = function() {
-		console.log('role', $scope.role);
-		//$modalInstance.close({role:$scope.role});
-		this.closeThisDialog(true);
-	};
-	
-});
+/*-
+ * ================================================================================
+ * ECOMP Portal
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ================================================================================
+ */
+app.controller('rolepopupController',  function ($scope, role, roleId, confirmBoxService, $http, $state, availableRoles, conf, availableRoleFunctions,ngDialog){
+	
+	  		$scope.role = role;
+	  		console.log($scope.role);
+	  		if($scope.role.childRoles==null){
+	  			$scope.role.childRoles=[];
+	  		}
+	  		
+	  		$scope.ociavailableRoles=availableRoles;
+	  		console.log($scope.ociavailableRoles);
+	  		
+	  		$scope.availableRoles=[];
+	  		if($scope.ociavailableRoles)
+	  			$.each($scope.ociavailableRoles, function(i, a){ 
+	  				var availableRole = a;
+	  				availableRole.selected = false;
+	  				if($scope.role.childRoles){
+	  			    $.each($scope.role.childRoles, function(j, b){ 
+	  			    	if(a.id === b.id) {
+	  			    		availableRole.selected = true;
+	  			    	}
+	  			    });
+	  				};
+	  			    $scope.availableRoles.push(availableRole);	    
+	  			});	
+	  			
+	  		$scope.ociavailableRoleFunctions = availableRoleFunctions; 
+	  		console.log($scope.ociavailableRoleFunctions);
+	  		$scope.availableRoleFunctions = []; 
+	  		if($scope.ociavailableRoleFunctions)
+	  			$.each($scope.ociavailableRoleFunctions, function(i, a){ 
+	  				var availableRoleFunction = a;
+	  				availableRoleFunction.selected = false;
+	  			    $.each($scope.role.roleFunctions, function(j, b){ 
+	  			    	if(a.code === b.code) {
+	  			    		availableRoleFunction.selected = true;
+	  			    	}
+	  			    });
+	  			    $scope.availableRoleFunctions.push(availableRoleFunction);	    
+	  		});
+	  		//$scope.resetMenu();
+		
+		$scope.toggleRoleFunction = function(selected,availableRoleFunction) {
+			//alert('toggleRole: '+selected);
+			 
+			if(!selected) {
+				//remove role function
+				if(role.id==null){
+					var index = $scope.role.roleFunctions.indexOf(availableRoleFunction);
+				 	if(index>=0)
+						$scope.role.roleFunctions.splice(index, 1);
+					return;
+				}
+				var uuu = conf.api.toggleRoleRoleFunction + "?role_id=" + roleId;
+				confirmBoxService.confirm("You are about to remove the role function "+availableRoleFunction.name+" from the role for "+$scope.role.name+". Do you want to continue?").then(
+		    			function(confirmed){
+		    					if(confirmed) {	
+								var postData={roleFunction:availableRoleFunction};
+								$http.post(uuu, postData).then(
+										function(response) {
+											$scope.role= response.data.role;
+										}, 
+										function(response) {
+											confirmBoxService.showInformation("Error while saving.");
+										}
+								);
+									
+									
+									
+									
+								}
+		    					 else {
+		    						 availableRoleFunction.selected=!availableRoleFunction.selected;
+			    				 }
+								/*
+							  	  $.ajax({
+							  		 type : 'POST',
+							  		 url : uuu,
+							  		 dataType: 'json',
+							  		 contentType: 'application/json',
+							  		 data: JSON.stringify(postData),
+							  		 success : function(data){
+							  			$scope.$apply(function(){$scope.role=data.role;}); 
+									 },
+									 error : function(data){
+										 modalService.showFailure("Fail","Error while saving.");
+									 }
+							  	  });
+							  	  */
+		    			});
+	
+			} else {
+				//add role function
+				if(role.id==null){
+					$scope.role.roleFunctions.push(availableRoleFunction);
+					return;
+				}
+				var uuu = conf.api.addRoleRoleFunction + "?role_id=" + roleId;
+				
+				confirmBoxService.confirm("You are about to add the role function "+availableRoleFunction.name+" to the role for "+$scope.role.name+". Do you want to continue?").then(
+		    			function(confirmed){
+		    				if(confirmed) {
+								  var postData={roleFunction:availableRoleFunction};
+								  $http.post(uuu,postData).then( function(response) {
+									  $scope.role=response.data.role;
+									  },
+									  
+									  function(data) {
+										  confirmBoxService.showInformation("Error while saving.");
+									  });
+							} else {
+									  availableRoleFunction.selected=!availableRoleFunction.selected;
+							}
+									/*		  
+								  	  $.ajax({
+								  		 type : 'POST',
+								  		 url : uuu,
+								  		 dataType: 'json',
+								  		 contentType: 'application/json',
+								  		 data: JSON.stringify(postData),
+								  		 success : function(data){
+								  			$scope.$apply(function(){$scope.role=data.role;}); 
+										 },
+										 error : function(data){
+											 modalService.showFailure("Fail","Error while saving.");
+										 }
+								  	  });
+								  	  
+									
+						    	},
+						    	function(){
+						    		availableRoleFunction.selected=!availableRoleFunction.selected;
+						    	})*/
+			});
+			
+			  
+	}
+		};
+	
+	$scope.toggleChildRole = function(selected,availableRole) {
+		//alert('toggleRole: '+selected);
+
+		if(!selected) {
+			//remove role
+			if(role.id==null){
+				var index = $scope.role.childRoles.indexOf(availableRole);
+			 	if(index>=0)
+					$scope.role.childRoles.splice(index, 1);
+				return;
+			}
+			var uuu = conf.api.toggleRoleChildRole +"?role_id=" + roleId;
+			
+			confirmBoxService.confirm("You are about to remove the child role "+availableRole.name+" from the role for "+$scope.role.name+". Do you want to continue?").then(
+	    			function(confirmed){
+	    				if(confirmed) {
+	    			
+						var postData={childRole:availableRole};
+						 $http.post(uuu,postData).then(function(response) {
+							  $scope.role=response.data.role;
+							  },
+							  function(data) {
+								  confirmBoxService.showInformation("Error while saving.");
+							  });
+						  } else {
+							  availableRole.selected=false;
+						  }
+	    			});
+					  	 /* $.ajax({
+					  		 type : 'POST',
+					  		 url : uuu,
+					  		 dataType: 'json',
+					  		 contentType: 'application/json',
+					  		 data: JSON.stringify(postData),
+					  		 success : function(data){
+					  			 console.log('role',data.role);
+					  			 $scope.$apply(function(){$scope.role=data.role;}); 
+							 },
+							 error : function(data){
+								 modalService.showFailure("Fail","Error while saving.");
+							 }
+					  	  });
+					  	  */
+				
+	    	
+		} else {
+			//add role
+			if(role.id==null){
+				$scope.role.childRoles.push(availableRole);
+				return;
+			}
+			var uuu = conf.api.addRoleChildRole +"?role_id=" + roleId;
+			
+			confirmBoxService.confirm("You are about to add the child role "+availableRole.name+" to the role for "+$scope.role.name+". Do you want to continue?").then(
+	    			function(confirmed){
+	    				if(confirmed) {
+						  var postData={childRole:availableRole};
+						  $http.post(uuu,postData).then(function(response) {
+							  $scope.role=response.data.role;
+							  },
+							  function(data) {
+								  confirmBoxService.showInformation("Error while saving.");
+							  });
+						  } else {
+							  availableRole.selected=false;
+						  }
+			  	 /* $.ajax({
+			  		 type : 'POST',
+			  		 url : uuu,
+			  		 dataType: 'json',
+			  		 contentType: 'application/json',
+			  		 data: JSON.stringify(postData),
+			  		 success : function(data){
+			  			$scope.$apply(function(){$scope.role=data.role;}); 
+					 },
+					 error : function(data){
+						 modalService.showFailure("Fail","Error while saving.");
+					 }
+			  	});*/
+				
+	    	});
+		
+		  
+	}
+	};
+	
+	$scope.close = function() {
+		console.log('role', $scope.role);
+		//$modalInstance.close({role:$scope.role});
+		this.closeThisDialog(true);
+	};
+	
+});