IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactor fix in 67c4c90159

Browse Source
This commit is contained in:
Régis Hanol 2014-12-03 13:00:02 +01:00
parent acc62f2ec2
commit f9f54e2626
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/models/admin_user.js
View File

@ -298,9 +298,7 @@ Discourse.AdminUser = Discourse.User.extend({
}); });
}, },
deleteForbidden: function() { deleteForbidden: Em.computed.not("canBeDeleted"),
return (!this.get('can_be_deleted') || this.get('post_count') > 0);
}.property('post_count'),
deleteExplanation: function() { deleteExplanation: function() {
if (this.get('deleteForbidden')) { if (this.get('deleteForbidden')) {

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

@ -20,8 +20,7 @@ export default ObjectController.extend({
isSuspended: Em.computed.notEmpty('user.suspend_reason'), isSuspended: Em.computed.notEmpty('user.suspend_reason'),
showBadges: Discourse.computed.setting('enable_badges'), showBadges: Discourse.computed.setting('enable_badges'),
showMoreBadges: Em.computed.gt('moreBadgesCount', 0), showMoreBadges: Em.computed.gt('moreBadgesCount', 0),
canDelete: Em.computed.not("user.deleteForbidden"), showDelete: Em.computed.and("viewingAdmin", "showName", "user.canBeDeleted"),
showDelete: Em.computed.and("viewingAdmin", "showName", "canDelete"),
moreBadgesCount: function() { moreBadgesCount: function() {
return this.get('user.badge_count') - this.get('user.featured_user_badges.length'); return this.get('user.badge_count') - this.get('user.featured_user_badges.length');
@ -74,14 +73,8 @@ 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) {
user = Discourse.User.create(user);
// A bit hacky. If viewing admin, wrap it in Discourse.AdminUser self.setProperties({ user: user, avatar: user, visible: true});
// 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);

3
app/assets/javascripts/discourse/models/user.js
View File

@ -11,6 +11,9 @@ Discourse.User = Discourse.Model.extend({
hasPMs: Em.computed.gt("private_messages_stats.all", 0), hasPMs: Em.computed.gt("private_messages_stats.all", 0),
hasStartedPMs: Em.computed.gt("private_messages_stats.mine", 0), hasStartedPMs: Em.computed.gt("private_messages_stats.mine", 0),
hasUnreadPMs: Em.computed.gt("private_messages_stats.unread", 0), hasUnreadPMs: Em.computed.gt("private_messages_stats.unread", 0),
hasPosted: Em.computed.gt("post_count", 0),
hasNotPosted: Em.computed.not("hasPosted"),
canBeDeleted: Em.computed.and("can_be_deleted", "hasNotPosted"),
/** /**
The user's stream The user's stream