discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-07-12 20:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

UX: Fix confusing admin UI for color scheme updates (#11100)

Browse Source
This commit is contained in:
Penar Musaraj 2020-11-02 11:28:04 -05:00 committed by GitHub
parent f5a726e52b
commit 5041ebe612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/assets/javascripts/admin/addon/models/color-scheme.js
View File

@ -20,7 +20,10 @@ const ColorScheme = EmberObject.extend({
}, },
startTrackingChanges() { startTrackingChanges() {
this.set("originals", { name: this.name }); this.set("originals", {
name: this.name,
user_selectable: this.user_selectable,
});
}, },
schemeJson() { schemeJson() {
@ -46,14 +49,22 @@ const ColorScheme = EmberObject.extend({
return newScheme; return newScheme;
}, },
@discourseComputed("name", "colors.@each.changed", "saving") @discourseComputed(
changed(name) { "name",
"user_selectable",
"colors.@each.changed",
"saving"
)
changed(name, user_selectable) {
if (!this.originals) { if (!this.originals) {
return false; return false;
} }
if (this.originals.name !== name) { if (this.originals.name !== name) {
return true; return true;
} }
if (this.originals.user_selectable !== user_selectable) {
return true;
}
if (this.colors.any((c) => c.get("changed"))) { if (this.colors.any((c) => c.get("changed"))) {
return true; return true;
} }
@ -80,9 +91,9 @@ const ColorScheme = EmberObject.extend({
this.setProperties({ savingStatus: I18n.t("saving"), saving: true }); this.setProperties({ savingStatus: I18n.t("saving"), saving: true });
const data = {}; const data = {};
if (!opts || !opts.enabledOnly) { if (!opts || !opts.enabledOnly) {
data.name = this.name; data.name = this.name;
data.user_selectable = this.user_selectable;
data.base_scheme_id = this.base_scheme_id; data.base_scheme_id = this.base_scheme_id;
data.colors = []; data.colors = [];
this.colors.forEach((c) => { this.colors.forEach((c) => {

9
app/assets/javascripts/admin/addon/templates/customize-colors-show.hbs
View File

@ -41,7 +41,14 @@
<br> <br>
<div class="admin-controls"> <div class="admin-controls">
{{inline-edit-checkbox action=(action "applyUserSelectable") labelKey="admin.customize.theme.color_scheme_user_selectable" checked=model.user_selectable}} {{#if model.theme_id}}
{{inline-edit-checkbox action=(action "applyUserSelectable") labelKey="admin.customize.theme.color_scheme_user_selectable" checked=model.user_selectable}}
{{else}}
<label>
{{input type="checkbox" checked=model.user_selectable}}
{{i18n "admin.customize.theme.color_scheme_user_selectable"}}
</label>
{{/if}}
</div> </div>
{{#if colors.length}} {{#if colors.length}}