osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

UX: confirmation before changing group membership in admin (#6426)

Browse Source
This commit is contained in:
Kyle Zhao
2018-10-02 12:34:08 +08:00
committed by Guo Xiang Tan
parent ab448ca8f3
commit d9bea66365
3 changed files with 79 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/controllers/admin-user-index.js.es6
+50 -12
View File
@@ -11,6 +11,7 @@ export default Ember.Controller.extend(CanCheckEmails, {
editingName: false,
editingTitle: false,
originalPrimaryGroupId: null,
customGroupIdsBuffer: null,
availableGroups: null,
userTitleValue: null,
@@ -30,6 +31,20 @@ export default Ember.Controller.extend(CanCheckEmails, {
"model.can_disable_second_factor"
),
@computed("model.customGroups")
customGroupIds(customGroups) {
return customGroups.mapBy("id");
},
@computed("customGroupIdsBuffer", "customGroupIds")
customGroupsDirty(buffer, original) {
if (buffer === null) return false;
return buffer.length === original.length
? buffer.any(id => !original.includes(id))
: true;
},
@computed("model.automaticGroups")
automaticGroups(automaticGroups) {
return automaticGroups
@@ -105,6 +120,27 @@ export default Ember.Controller.extend(CanCheckEmails, {
}
},
groupAdded(added) {
this.get("model")
.groupAdded(added)
.catch(function() {
bootbox.alert(I18n.t("generic_error"));
});
},
groupRemoved(groupId) {
this.get("model")
.groupRemoved(groupId)
.then(() => {
if (groupId === this.get("originalPrimaryGroupId")) {
this.set("originalPrimaryGroupId", null);
}
})
.catch(function() {
bootbox.alert(I18n.t("generic_error"));
});
},
actions: {
impersonate() {
return this.get("model").impersonate();
@@ -278,20 +314,22 @@ export default Ember.Controller.extend(CanCheckEmails, {
this.get("model").generateApiKey();
},
groupAdded(added) {
this.get("model")
.groupAdded(added)
.catch(function() {
bootbox.alert(I18n.t("generic_error"));
});
saveCustomGroups() {
const currentIds = this.get("customGroupIds");
const bufferedIds = this.get("customGroupIdsBuffer");
const availableGroups = this.get("availableGroups");
bufferedIds.filter(id => !currentIds.includes(id)).forEach(id => {
this.groupAdded(availableGroups.findBy("id", id));
});
currentIds
.filter(id => !bufferedIds.includes(id))
.forEach(id => this.groupRemoved(id));
},
groupRemoved(groupId) {
this.get("model")
.groupRemoved(groupId)
.catch(function() {
bootbox.alert(I18n.t("generic_error"));
});
resetCustomGroups() {
this.set("customGroupIdsBuffer", null);
},
savePrimaryGroup() {
app/assets/javascripts/admin/templates/user-index.hbs
+21 -11
View File
@@ -459,19 +459,29 @@
<div class='display-row'>
<div class='field'>{{i18n 'admin.groups.custom'}}</div>
<div class='value'>
{{admin-group-selector selected=model.customGroups available=availableGroups}}
</div>
<div class='controls'>
{{#if model.customGroups}}
{{i18n 'admin.groups.primary'}}
{{combo-box content=model.customGroups value=model.primary_group_id none="admin.groups.no_primary"}}
{{/if}}
{{#if primaryGroupDirty}}
{{d-button icon="check" class="ok" action="savePrimaryGroup"}}
{{d-button icon="times" class="cancel" action="resetPrimaryGroup"}}
{{/if}}
{{admin-group-selector selected=model.customGroups available=availableGroups buffer=customGroupIdsBuffer}}
</div>
{{#if customGroupsDirty}}
<div class='controls'>
{{d-button icon="check" class="ok" action="saveCustomGroups"}}
{{d-button icon="times" class="cancel" action="resetCustomGroups"}}
</div>
{{/if}}
</div>
{{#if model.customGroups}}
<div class='display-row'>
<div class='field'>{{i18n 'admin.groups.primary'}}</div>
<div class='value'>
{{combo-box content=model.customGroups value=model.primary_group_id none="admin.groups.no_primary"}}
</div>
{{#if primaryGroupDirty}}
<div class='controls'>
{{d-button icon="check" class="ok" action="savePrimaryGroup"}}
{{d-button icon="times" class="cancel" action="resetPrimaryGroup"}}
</div>
{{/if}}
</div>
{{/if}}
</section>
{{/if}}