Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Onboarding Page Account Admin Change
[portal.git]
/
ecomp-portal-FE-common
/
client
/
app
/
views
/
users
/
new-user-dialogs
/
new-user.controller.js
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
d989518
..
8c04fa5
100644
(file)
--- 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
@@
-33,7
+33,7
@@
*
* ============LICENSE_END============================================
*
*
* ============LICENSE_END============================================
*
- *
ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ *
*/
/**
* Created by nnaffar on 12/20/15.
*/
/**
* Created by nnaffar on 12/20/15.
@@
-43,6
+43,18
@@
class NewUserModalCtrl {
constructor($scope, $log, usersService, applicationsService, confirmBoxService, items) {
var extRequestValue = false;
class NewUserModalCtrl {
constructor($scope, $log, usersService, applicationsService, confirmBoxService, items) {
var extRequestValue = false;
+ var isSystemUser = false;
+
+ $scope.ngRepeatDemo = [
+ {id: 'userButton', value: 'true', labelvalue: 'User'},
+ {id: 'systemUserButton', value: 'false', labelvalue: 'System'}
+ ]
+
+ $scope.selectedvalueradioButtonGroup = {
+ type: 'true'
+ }
+
+
let init = () => {
//$log.info('NewUserModalCtrl::init');
this.isSaving = false;
let init = () => {
//$log.info('NewUserModalCtrl::init');
this.isSaving = false;
@@
-94,7
+106,7
@@
this.dialogState = 1;
return;
}
this.dialogState = 1;
return;
}
-
//
$log.debug('NewUserModalCtrl::getUserAppsRoles: about to call getAdminAppsSimpler');
+ $log.debug('NewUserModalCtrl::getUserAppsRoles: about to call getAdminAppsSimpler');
this.isGettingAdminApps = true;
applicationsService.getAdminAppsSimpler().then((apps) => {
//$log.debug('NewUserModalCtrl::getUserAppsRoles: beginning of then for getAdminAppsSimpler');
this.isGettingAdminApps = true;
applicationsService.getAdminAppsSimpler().then((apps) => {
//$log.debug('NewUserModalCtrl::getUserAppsRoles: beginning of then for getAdminAppsSimpler');
@@
-123,7
+135,11
@@
app.isErrorUpdating = false;
app.isDoneUpdating = false;
app.errorMessage = "";
app.isErrorUpdating = false;
app.isDoneUpdating = false;
app.errorMessage = "";
- usersService.getUserAppRoles(app.id, this.selectedUser.orgUserId, extRequestValue).promise().then((userAppRolesResult) => {
+ if($scope.selectedvalueradioButtonGroup.type == 'false')
+ {
+ isSystemUser = true;
+ }
+ usersService.getUserAppRoles(app.id, this.selectedUser.orgUserId, extRequestValue,isSystemUser).promise().then((userAppRolesResult) => {
//$log.debug('NewUserModalCtrl::getUserAppsRoles: got a result for app: ',app.id,': ',app.name,': ',userAppRolesResult);
app.appRoles = userAppRolesResult;
app.isLoading = false;
//$log.debug('NewUserModalCtrl::getUserAppsRoles: got a result for app: ',app.id,': ',app.name,': ',userAppRolesResult);
app.appRoles = userAppRolesResult;
app.isLoading = false;
@@
-179,11
+195,18
@@
}
}
}
}
+ if($scope.selectedvalueradioButtonGroup.type == 'false')
+ {
+ isSystemUser = true;
+ }else{
+ isSystemUser = false;
+ }
var newUserAppRoles = {
orgUserId: this.selectedUser.orgUserId,
appId: app.id,
appRoles: app.appRoles,
var newUserAppRoles = {
orgUserId: this.selectedUser.orgUserId,
appId: app.id,
appRoles: app.appRoles,
- appName: app.name
+ appName: app.name,
+ isSystemUser : isSystemUser
};
usersService.updateUserAppRoles(newUserAppRoles).promise()
.then(res => {
};
usersService.updateUserAppRoles(newUserAppRoles).promise()
.then(res => {
@@
-193,7
+216,7
@@
this.numberAppsSucceeded++;
}).catch(err => {
$log.error(err);
this.numberAppsSucceeded++;
}).catch(err => {
$log.error(err);
- var errorMessage = 'Failed to update the user application roles: ' + err
.status
;
+ var errorMessage = 'Failed to update the user application roles: ' + err;
if(err.status == 504){
this.numberAppsSucceeded++;
errorMessage = 'Request is being processed, please check back later!';
if(err.status == 504){
this.numberAppsSucceeded++;
errorMessage = 'Request is being processed, please check back later!';