github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-26 16:27:56 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: Don't save automatically when resetting site settings in admin page.

Browse Source
This commit is contained in:
Guo Xiang Tan 2019-01-11 16:39:21 +08:00
parent 656d82665d
commit 0fa92699e2
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/admin/mixins/setting-component.js.es6
View File

@ -17,7 +17,7 @@ const CUSTOM_TYPES = [
];
export default Ember.Mixin.create({
classNameBindings: [":row", ":setting", "setting.overridden", "typeClass"],
classNameBindings: [":row", ":setting", "overridden", "typeClass"],
content: Ember.computed.alias("setting"),
validationMessage: null,
isSecret: Ember.computed.oneWay("setting.secret"),
@ -81,12 +81,16 @@ export default Ember.Mixin.create({
return "site-settings/" + typeClass;
},
@computed("setting.default", "buffered.value")
overridden(settingDefault, bufferedValue) {
return settingDefault !== bufferedValue;
},
_watchEnterKey: function() {
const self = this;
this.$().on("keydown.setting-enter", ".input-setting-string", function(e) {
this.$().on("keydown.setting-enter", ".input-setting-string", e => {
if (e.keyCode === 13) {
// enter key
self.send("save");
this.send("save");
}
});
}.on("didInsertElement"),
@ -124,7 +128,6 @@ export default Ember.Mixin.create({
resetDefault() {
this.set("buffered.value", this.get("setting.default"));
this.send("save");
},
toggleSecret() {

13
test/javascripts/acceptance/admin-site-settings-test.js.es6
View File

@ -47,6 +47,19 @@ QUnit.test("changing value updates dirty state", async assert => {
"setting isn't marked as overriden after undo"
);
await click("button.cancel");
assert.ok(
exists(".row.setting.overridden"),
"setting is marked as overriden after cancel"
);
await click("button.undo");
await click("button.ok");
assert.ok(
!exists(".row.setting.overridden"),
"setting isn't marked as overriden after undo"
);
await fillIn(".input-setting-string", "Test");
await keyEvent(".input-setting-string", "keydown", 13); // enter
assert.ok(