github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 01:56:58 +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

12
app/assets/javascripts/admin/controllers/admin-user-index.js.es6
View File

@ -9,7 +9,7 @@ export default ObjectController.extend(CanCheckEmails, {
showApproval: Discourse.computed.setting('must_approve_users'),
showBadges: Discourse.computed.setting('enable_badges'),
primaryGroupDirty: Discourse.computed.propertyNotEqual('originalPrimaryGroupId', 'primary_group_id'),
primaryGroupDirty: Discourse.computed.propertyNotEqual('originalPrimaryGroupId', 'model.primary_group_id'),
automaticGroups: function() {
return this.get("model.automaticGroups").map((g) => g.name).join(", ");
@ -17,7 +17,7 @@ export default ObjectController.extend(CanCheckEmails, {
userFields: function() {
const siteUserFields = this.site.get('user_fields'),
userFields = this.get('user_fields');
userFields = this.get('model.user_fields');
if (!Ember.isEmpty(siteUserFields)) {
return siteUserFields.map(function(uf) {
@ -26,7 +26,7 @@ export default ObjectController.extend(CanCheckEmails, {
});
}
return [];
}.property('user_fields.@each'),
}.property('model.user_fields.@each'),
actions: {
toggleTitleEdit() {
@ -67,16 +67,16 @@ export default ObjectController.extend(CanCheckEmails, {
return Discourse.ajax("/admin/users/" + this.get('id') + "/primary_group", {
type: 'PUT',
data: {primary_group_id: this.get('primary_group_id')}
data: {primary_group_id: this.get('model.primary_group_id')}
}).then(function () {
self.set('originalPrimaryGroupId', self.get('primary_group_id'));
self.set('originalPrimaryGroupId', self.get('model.primary_group_id'));
}).catch(function() {
bootbox.alert(I18n.t('generic_error'));
});
},
resetPrimaryGroup() {
this.set('primary_group_id', this.get('originalPrimaryGroupId'));
this.set('model.primary_group_id', this.get('originalPrimaryGroupId'));
},
regenerateApiKey() {