github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-29 01:31:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Import Promise from rsvp (#8296)

Browse Source
This commit is contained in:
Mark VanLandingham
2019-11-05 10:37:32 -06:00
committed by GitHub
parent 94a34af702
commit 014f19b6ea
44 changed files with 128 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ 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 { Promise } from "rsvp";
const wrapAdmin = user => (user ? AdminUser.create(user) : null);
@ -503,7 +504,7 @@ const AdminUser = Discourse.User.extend({
loadDetails() {
if (this.loadedDetails) {
return Ember.RSVP.resolve(this);
return Promise.resolve(this);
}
return AdminUser.find(this.id).then(result => {