mirror of https://github.com/MISP/MISP
fix: [UI] Show warning if notification when creating new user could not be send
parent
aa58de115f
commit
461318de19
|
@ -751,7 +751,9 @@ class UsersController extends AppController
|
||||||
$password = isset($this->request->data['User']['password']) ? $this->request->data['User']['password'] : false;
|
$password = isset($this->request->data['User']['password']) ? $this->request->data['User']['password'] : false;
|
||||||
$result = $this->User->initiatePasswordReset($user, true, true, $password);
|
$result = $this->User->initiatePasswordReset($user, true, true, $password);
|
||||||
if ($result && empty(Configure::read('MISP.disable_emailing'))) {
|
if ($result && empty(Configure::read('MISP.disable_emailing'))) {
|
||||||
$notification_message .= ' User notified of new credentials.';
|
$notification_message .= ' ' . __('User notified of new credentials.');
|
||||||
|
} else {
|
||||||
|
$notification_message .= ' ' . __('User notification of new credentials could not be send.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($this->_isRest()) {
|
if ($this->_isRest()) {
|
||||||
|
@ -762,7 +764,7 @@ class UsersController extends AppController
|
||||||
$user['User']['password'] = '******';
|
$user['User']['password'] = '******';
|
||||||
return $this->RestResponse->viewData($user, $this->response->type());
|
return $this->RestResponse->viewData($user, $this->response->type());
|
||||||
} else {
|
} else {
|
||||||
$this->Flash->success(__('The user has been saved.' . $notification_message));
|
$this->Flash->success(__('The user has been saved.') . $notification_message);
|
||||||
$this->redirect(array('action' => 'index'));
|
$this->redirect(array('action' => 'index'));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue