mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-31 13:40:20 +02:00
Code Issues Releases Wiki Activity

Improve client XHR error handling

Browse Source 
The default XHR error handler produce an alert which is appropriate to the response status code. It can be overridden per-request (by specifying the `errorHandler` option) so that the alert can be suppressed or displayed in a different position (e.g. inside a modal).

ref #118
This commit is contained in:
Toby Zerner
2015-10-20 12:48:26 +10:30
parent 7490709af8
commit 26a821e3e2
26 changed files with 192 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/Command/EditUserHandler.php
View File

@@ -63,6 +63,7 @@ class EditUserHandler
$attributes = array_get($data, 'attributes', []);
$relationships = array_get($data, 'relationships', []);
$validate = [];
if (isset($attributes['username'])) {
$this->assertPermission($canEdit);
@@ -72,6 +73,10 @@ class EditUserHandler
if (isset($attributes['email'])) {
if ($isSelf) {
$user->requestEmailChange($attributes['email']);
if ($attributes['email'] !== $user->email) {
$validate['email'] = $attributes['email'];
}
} else {
$this->assertPermission($canEdit);
$user->changeEmail($attributes['email']);
@@ -81,6 +86,8 @@ class EditUserHandler
if (isset($attributes['password'])) {
$this->assertPermission($canEdit);
$user->changePassword($attributes['password']);
$validate['password'] = $attributes['password'];
}
if (isset($attributes['bio'])) {
@@ -127,7 +134,7 @@ class EditUserHandler
new UserWillBeSaved($user, $actor, $data)
);
$this->validator->assertValid(array_merge($user->getDirty(), array_only($attributes, ['password', 'email'])));
$this->validator->assertValid(array_merge($user->getDirty(), $validate));
$user->save();