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

Better error messages on admin for granting moderation

Browse Source 
Also fixes up Ember deprecations.
This commit is contained in:
Robin Ward
2015-05-19 10:56:32 -04:00
parent d889f05480
commit 4e0d7683ab
5 changed files with 81 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,5 @@
import { popupAjaxError } from 'discourse/lib/ajax-error';
const AdminUser = Discourse.User.extend({
customGroups: Em.computed.filter("groups", (g) => !g.automatic && Discourse.Group.create(g)),
@ -90,14 +92,7 @@ const AdminUser = Discourse.User.extend({
can_grant_admin: false,
can_revoke_admin: true
});
}).catch(function(e) {
let error;
if (e.responseJSON && e.responseJSON.error) {
error = e.responseJSON.error;
}
error = error || I18n.t('admin.user.grant_admin_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
}).catch(popupAjaxError);
},
revokeModeration() {
@ -110,7 +105,7 @@ const AdminUser = Discourse.User.extend({
can_grant_moderation: true,
can_revoke_moderation: false
});
});
}).catch(popupAjaxError);
},
grantModeration() {
@ -123,14 +118,7 @@ const AdminUser = Discourse.User.extend({
can_grant_moderation: false,
can_revoke_moderation: true
});
}).catch(function(e) {
let error;
if (e.responseJSON && e.responseJSON.error) {
error = e.responseJSON.error;
}
error = error || I18n.t('admin.user.grant_moderation_failed', { error: "http: " + e.status + " - " + e.body });
bootbox.alert(error);
});
}).catch(popupAjaxError);
},
refreshBrowsers() {
@ -156,10 +144,6 @@ const AdminUser = Discourse.User.extend({
this.set('originalTrustLevel', this.get('trust_level'));
},
trustLevels: function() {
return Discourse.Site.currentProp('trustLevels');
}.property(),
dirty: Discourse.computed.propertyNotEqual('originalTrustLevel', 'trustLevel.id'),
saveTrustLevel() {