IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-02 05:29:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Clicking avatars broke for non-admins

Browse Source
This commit is contained in:
Robin Ward 2014-12-02 15:24:05 -05:00
parent 461196f089
commit 67c4c90159
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/assets/javascripts/discourse/controllers/user-card.js.es6
View File

@ -74,7 +74,14 @@ export default ObjectController.extend({
self.set('cardTarget', target); self.set('cardTarget', target);
Discourse.User.findByUsername(username).then(function (user) { Discourse.User.findByUsername(username).then(function (user) {
self.setProperties({ user: Discourse.AdminUser.create(user), avatar: user, visible: true});
// A bit hacky. If viewing admin, wrap it in Discourse.AdminUser
// TODO: Restructure this to be cleaner
var wrapped = user;
if (self.get('viewingAdmin')) {
wrapped = Discourse.AdminUser.create(user);
}
self.setProperties({ user: wrapped, avatar: user, visible: true});
self.appEvents.trigger('usercard:shown'); self.appEvents.trigger('usercard:shown');
}).finally(function(){ }).finally(function(){
self.set('userLoading', null); self.set('userLoading', null);