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

FIX: Prepend the user id before username in admin user routes

Browse Source
This commit is contained in:
Erick Guan
2015-09-26 15:56:36 +02:00
parent b2ffaa0822
commit 35142847ba
9 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,7 +402,7 @@ const AdminUser = Discourse.User.extend({
}
}
}).catch(function() {
AdminUser.find( user.get('username') ).then(function(u){ user.setProperties(u); });
AdminUser.find(user.get('id')).then(u => user.setProperties(u));
bootbox.alert(I18n.t("admin.user.delete_failed"));
});
};
@ -475,7 +475,7 @@ const AdminUser = Discourse.User.extend({
if (user.get('loadedDetails')) { return Ember.RSVP.resolve(user); }
return AdminUser.find(user.get('username_lower')).then(function (result) {
return AdminUser.find(user.get('id')).then(result => {
user.setProperties(result);
user.set('loadedDetails', true);
});
@ -533,8 +533,8 @@ AdminUser.reopenClass({
});
},
find(username) {
return Discourse.ajax("/admin/users/" + username + ".json").then(function (result) {
find(user_id) {
return Discourse.ajax("/admin/users/" + user_id + ".json").then(result => {
result.loadedDetails = true;
return AdminUser.create(result);
});