Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Error messages from editing user being swallowed (#10908)

This commit is contained in:
Mark VanLandingham 2020-10-13 10:37:33 -05:00 committed by GitHub
parent 95a142741c
commit b19e8ea206
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/admin/addon/models/admin-user.js
View File

@ -139,8 +139,8 @@ const AdminUser = User.extend({
bootbox.hideAll(); bootbox.hideAll();
let error; let error;
AdminUser.find(user.get("id")).then((u) => user.setProperties(u)); AdminUser.find(user.get("id")).then((u) => user.setProperties(u));
if (e.responseJSON && e.responseJSON.errors) { if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
error = e.responseJSON.errors[0]; error = e.jqXHR.responseJSON.errors[0];
} }
error = error || I18n.t("admin.user.delete_posts_failed"); error = error || I18n.t("admin.user.delete_posts_failed");
bootbox.alert(error); bootbox.alert(error);
@ -236,8 +236,8 @@ const AdminUser = User.extend({
.then(() => window.location.reload()) .then(() => window.location.reload())
.catch((e) => { .catch((e) => {
let error; let error;
if (e.responseJSON && e.responseJSON.errors) { if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
error = e.responseJSON.errors[0]; error = e.jqXHR.responseJSON.errors[0];
} }
error = error =
error || error ||
@ -260,8 +260,8 @@ const AdminUser = User.extend({
.then(() => window.location.reload()) .then(() => window.location.reload())
.catch((e) => { .catch((e) => {
let error; let error;
if (e.responseJSON && e.responseJSON.errors) { if (e.jqXHR.responseJSON && e.jqXHR.responseJSON.errors) {
error = e.responseJSON.errors[0]; error = e.jqXHR.responseJSON.errors[0];
} }
error = error =
error || error ||