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

Fix delete user button on admin/user page so it's enabled at the right times, and update its title attribute to be more helpful

Browse Source
This commit is contained in:
Neil Lalonde
2013-08-08 12:34:42 -04:00
parent 86246a64eb
commit ce05b43c1d
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,12 +202,12 @@ Discourse.AdminUser = Discourse.User.extend({
},
deleteForbidden: function() {
return (this.get('post_count') > 0);
return (!this.get('can_be_deleted') || this.get('post_count') > 0);
}.property('post_count'),
deleteButtonTitle: function() {
if (this.get('deleteForbidden')) {
return I18n.t('admin.user.delete_forbidden');
return I18n.t('admin.user.delete_forbidden', {count: Discourse.SiteSettings.delete_user_max_age});
} else {
return null;
}