From 23634dba70b166ad3c79b5eadfbd32b5375d44be Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Mon, 25 Sep 2017 16:07:54 -0400 Subject: MariaDB Connector and Sonar Scans; clean nl PORTAL-50: Fix to get the Sonar coverage for ONAP PORTAL-72: Sonar scan - resolving severity Blocker issues PORTAL-86: Remove internal att.com usages from tests and other files PORTAL-102: Fixed the page refresh issue on App Account Management page PORTAL-103: Fix to enhanced notification ticket source for ONAP PORTAL-104: Replaced mysql DB connector with mariaDB Issue: PORTAL-50 PORTAL-72 PORTAL-86 PORTAL-102 PORTAL-103 PORTAL-104 Change-Id: Iae78ad34ed9ce5ae1f2d36fcbb93fbc1e39944e5 Signed-off-by: Christopher Lott (cl778h) --- .../views/users/new-user-dialogs/new-user.controller.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'ecomp-portal-FE-common/client/app/views/users/new-user-dialogs') diff --git a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js index 5367ecf8..10d6c954 100644 --- a/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js +++ b/ecomp-portal-FE-common/client/app/views/users/new-user-dialogs/new-user.controller.js @@ -174,11 +174,17 @@ app.isDoneUpdating = true; this.numberAppsSucceeded++; }).catch(err => { - $log.error(err); - app.isErrorUpdating = true; + $log.error(err); + var errorMessage = 'Failed to update the user application roles: ' + err.status; + if(err.status == 504){ + this.numberAppsSucceeded++; + errorMessage = 'Request is being processed, please check back later!'; + } else{ + app.isErrorUpdating = true; + } confirmBoxService.showInformation( - 'Failed to update the user application roles: ' + err.status) - .then(isConfirmed => {}); + errorMessage) + .then(isConfirmed => {}); }).finally(()=>{ this.numberAppsProcessed++; if (this.numberAppsProcessed === this.adminApps.length) { -- cgit 1.2.3-korg