mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24530 from owncloud/backport-24526-forward-user-manager-error-messages-to-ui 

[9.0] Pass on the error message from the user manager to the UI
This commit is contained in:
Vincent Petry 2016-05-13 16:11:55 +02:00
parent f8979a9ee2 decb4789bb
commit 27b12d2901
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
settings/controller/userscontroller.php
View File

@ -355,9 +355,13 @@ class UsersController extends Controller {
try {
$user = $this->userManager->createUser($username, $password);
} catch (\Exception $exception) {
$message = $exception->getMessage();
if (!$message) {
$message = $this->l10n->t('Unable to create user.');
}
return new DataResponse(
array(
'message' => (string)$this->l10n->t('Unable to create user.')
'message' => (string) $message,
),
Http::STATUS_FORBIDDEN
);

2
settings/js/users/users.js
View File

@ -825,7 +825,7 @@ $(document).ready(function () {
}).fail(function(result) {
OC.Notification.showTemporary(t('settings', 'Error creating user: {message}', {
message: result.responseJSON.message
}));
}, undefined, {escape: false}));
}).success(function(){
$('#newuser').get(0).reset();
});