mirror of
https://github.com/discourse/discourse.git
synced 2026-08-10 04:58:31 -05:00
FIX: Resetting site setting didn't remove "overriden" state
This commit is contained in:
@@ -84,7 +84,7 @@ export default Ember.Mixin.create({
|
||||
this.$().on("keydown.setting-enter", ".input-setting-string", function(e) {
|
||||
if (e.keyCode === 13) {
|
||||
// enter key
|
||||
self._save();
|
||||
self.send("save");
|
||||
}
|
||||
});
|
||||
}.on("didInsertElement"),
|
||||
@@ -122,7 +122,7 @@ export default Ember.Mixin.create({
|
||||
|
||||
resetDefault() {
|
||||
this.set("buffered.value", this.get("setting.default"));
|
||||
this._save();
|
||||
this.send("save");
|
||||
},
|
||||
|
||||
toggleSecret() {
|
||||
|
||||
@@ -13,5 +13,5 @@
|
||||
{{#if setting.secret}}
|
||||
{{d-button action="toggleSecret" icon="eye-slash"}}
|
||||
{{/if}}
|
||||
{{d-button action="resetDefault" icon="undo" label="admin.settings.reset"}}
|
||||
{{d-button class="undo" action="resetDefault" icon="undo" label="admin.settings.reset"}}
|
||||
{{/if}}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<div class='admin-controls'>
|
||||
|
||||
|
||||
<div class='controls'>
|
||||
{{d-button action="toggleMenu" class="menu-toggle" icon="bars"}}
|
||||
{{text-field value=filter placeholderKey="type_to_filter" class="no-blur"}}
|
||||
{{d-button action="clearFilter" label="admin.site_settings.clear_filter"}}
|
||||
{{text-field id="setting-filter" value=filter placeholderKey="type_to_filter" class="no-blur"}}
|
||||
{{d-button id="clear-filter" action="clearFilter" label="admin.site_settings.clear_filter"}}
|
||||
</div>
|
||||
<div class='search controls'>
|
||||
<label>
|
||||
|
||||
Reference in New Issue
Block a user