github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: improve code readability & add tests for user guardian.

Browse Source 
a511bea4cc3f50bd1e067a46bdbf5cd19eb335a3
This commit is contained in:
Vinoth Kannan
2020-04-30 20:59:33 +05:30
parent c092370847
commit 71241a50f7
8 changed files with 62 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ import { ajax } from "discourse/lib/ajax";
import { propertyNotEqual } from "discourse/lib/computed";
import { popupAjaxError } from "discourse/lib/ajax-error";
import Group from "discourse/models/group";
import { userPath } from "discourse/lib/url";
import DiscourseURL, { userPath } from "discourse/lib/url";
import { Promise } from "rsvp";
import User from "discourse/models/user";
@ -514,16 +514,16 @@ const AdminUser = User.extend({
formData["target_username"] = opts.targetUsername;
}
return ajax(`/admin/users/${user.get("id")}/merge.json`, {
return ajax(`/admin/users/${user.id}/merge.json`, {
type: "POST",
data: formData
})
.then(function(data) {
.then(data => {
if (data.merged) {
if (/^\/admin\/users\/list\//.test(location)) {
document.location = location;
DiscourseURL.redirectTo(location);
} else {
document.location = Discourse.getURL(
DiscourseURL.redirectTo(
`/admin/users/${data.user.id}/${data.user.username}`
);
}
@ -534,8 +534,8 @@ const AdminUser = User.extend({
}
}
})
.catch(function() {
AdminUser.find(user.get("id")).then(u => user.setProperties(u));
.catch(() => {
AdminUser.find(user.id).then(u => user.setProperties(u));
bootbox.alert(I18n.t("admin.user.merge_failed"));
});
},