From 978dbcf0a196acbafad72fe1e2478ec0e384f02f Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Wed, 23 Aug 2017 18:27:19 -0400
Subject: Deliver centralized role management feature

Repair multiple defects also.
Revise deployment to use docker-compose.
Remove all zip archives.

Issue: PORTAL-21, PORTAL-25, PORTAL-28, PORTAL-52, PORTAL-69,
    PORTAL-74, PORTAL-76, PORTAL-80, PORTAL-82
Change-Id: Ie72fec7d35ba78beb162bba6ed27b2caee340c61
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 .../app/views/role/rolepopupmodelController.js     | 33 ++++++++++++----------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js')

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 1176e50a..67bf3b2e 100644
--- a/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js
+++ b/ecomp-portal-FE-common/client/app/views/role/rolepopupmodelController.js
@@ -88,9 +88,6 @@ app.controller('rolepopupController',  function ($scope, role, roleId, confirmBo
 									
 									
 								}
-		    					 else {
-		    						 availableRoleFunction.selected=!availableRoleFunction.selected;
-			    				 }
 								/*
 							  	  $.ajax({
 							  		 type : 'POST',
@@ -106,7 +103,11 @@ app.controller('rolepopupController',  function ($scope, role, roleId, confirmBo
 									 }
 							  	  });
 							  	  */
-		    			});
+		    			}).catch(function(err) {
+							  availableRoleFunction.selected=!availableRoleFunction.selected;
+					    		$log.error('roleListController::confirmBoxService.confirm error:', err);
+
+				    	});
 	
 			} else {
 				//add role function
@@ -127,10 +128,7 @@ app.controller('rolepopupController',  function ($scope, role, roleId, confirmBo
 									  function(data) {
 										  confirmBoxService.showInformation("Error while saving.");
 									  });
-							} else {
-									  availableRoleFunction.selected=!availableRoleFunction.selected;
-							}
-									/*		  
+							}	/*		  
 								  	  $.ajax({
 								  		 type : 'POST',
 								  		 url : uuu,
@@ -150,7 +148,10 @@ app.controller('rolepopupController',  function ($scope, role, roleId, confirmBo
 						    	function(){
 						    		availableRoleFunction.selected=!availableRoleFunction.selected;
 						    	})*/
-			});
+			}).catch(function(err) {
+				  availableRoleFunction.selected=!availableRoleFunction.selected;
+		    		$log.error('roleListController::confirmBoxService.confirm error:', err);
+	    	});
 			
 			  
 	}
@@ -180,10 +181,11 @@ app.controller('rolepopupController',  function ($scope, role, roleId, confirmBo
 							  function(data) {
 								  confirmBoxService.showInformation("Error while saving.");
 							  });
-						  } else {
-							  availableRole.selected=false;
 						  }
-	    			});
+	    			}).catch(function(err) {
+	    				availableRole.selected=!availableRole.selected;
+			    		$log.error('roleListController::confirmBoxService.confirm error:', err);
+		    	});
 					  	 /* $.ajax({
 					  		 type : 'POST',
 					  		 url : uuu,
@@ -219,8 +221,6 @@ app.controller('rolepopupController',  function ($scope, role, roleId, confirmBo
 							  function(data) {
 								  confirmBoxService.showInformation("Error while saving.");
 							  });
-						  } else {
-							  availableRole.selected=false;
 						  }
 			  	 /* $.ajax({
 			  		 type : 'POST',
@@ -236,7 +236,10 @@ app.controller('rolepopupController',  function ($scope, role, roleId, confirmBo
 					 }
 			  	});*/
 				
-	    	});
+	    	}).catch(function(err) {
+				availableRole.selected=!availableRole.selected;
+	    		$log.error('roleListController::confirmBoxService.confirm error:', err);
+    	});
 		
 		  
 	}
-- 
cgit 1.2.3-korg