Merge "Assign project role to the user when the user is created"
This commit is contained in:
commit
f8f565337c
@ -76,14 +76,16 @@
|
|||||||
|
|
||||||
function submit(context) {
|
function submit(context) {
|
||||||
return keystone.createUser(context.model).then(success);
|
return keystone.createUser(context.model).then(success);
|
||||||
}
|
|
||||||
|
|
||||||
function success(response) {
|
function success(response) {
|
||||||
var user = response.data;
|
var user = response.data;
|
||||||
toast.add('success', interpolate(message.success, [user.name]));
|
toast.add('success', interpolate(message.success, [user.name]));
|
||||||
return actionResultService.getActionResult()
|
// Assign project role for the new user.
|
||||||
.created(resourceType, user.id)
|
keystone.grantRole(user.default_project_id, context.model.role, user.id);
|
||||||
.result;
|
return actionResultService.getActionResult()
|
||||||
|
.created(resourceType, user.id)
|
||||||
|
.result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
@ -92,6 +92,7 @@
|
|||||||
var deferred = $q.defer();
|
var deferred = $q.defer();
|
||||||
spyOn(keystone, 'createUser').and.returnValue(deferred.promise);
|
spyOn(keystone, 'createUser').and.returnValue(deferred.promise);
|
||||||
spyOn(toast, 'add').and.callFake(angular.noop);
|
spyOn(toast, 'add').and.callFake(angular.noop);
|
||||||
|
spyOn(keystone, 'grantRole');
|
||||||
var handler = jasmine.createSpyObj('handler', ['success']);
|
var handler = jasmine.createSpyObj('handler', ['success']);
|
||||||
|
|
||||||
deferred.resolve({data: {name: 'saved', id: '12345'}});
|
deferred.resolve({data: {name: 'saved', id: '12345'}});
|
||||||
|
Loading…
Reference in New Issue
Block a user