github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-01-29 13:57:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Select-based setting breaking admin pages

Browse Source
This commit is contained in:
David 2021-07-20 20:53:27 +01:00 committed by Daniël Klabbers
parent c7613af913
commit ba08eb0039
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
framework/core/js/src/admin/components/AdminPage.js
View File

@ -98,39 +98,37 @@ export default class AdminPage extends Page {
return entry.call(this);
}
const { setting, help, ...componentAttrs } = entry;
const { setting, help, type, label, ...componentAttrs } = entry;
const value = this.setting([setting])();
if (['bool', 'checkbox', 'switch', 'boolean'].includes(componentAttrs.type)) {
const value = this.setting(setting)();
if (['bool', 'checkbox', 'switch', 'boolean'].includes(type)) {
return (
<div className="Form-group">
<Switch state={!!value && value !== '0'} onchange={this.settings[setting]} {...componentAttrs}>
{componentAttrs.label}
{label}
</Switch>
<div className="helpText">{help}</div>
</div>
);
} else if (['select', 'dropdown', 'selectdropdown'].includes(componentAttrs.type)) {
} else if (['select', 'dropdown', 'selectdropdown'].includes(type)) {
const { default: defaultValue, options } = componentAttrs;
return (
<div className="Form-group">
<label>{componentAttrs.label}</label>
<label>{label}</label>
<div className="helpText">{help}</div>
<Select
value={value || componentAttrs.default}
options={componentAttrs.options}
buttonClassName="Button"
onchange={this.settings[setting]}
{...componentAttrs}
/>
<Select value={value || defaultValue} options={options} onchange={this.settings[setting]} {...componentAttrs} />
</div>
);
} else {
componentAttrs.className = classList(['FormControl', componentAttrs.className]);
return (
<div className="Form-group">
{componentAttrs.label ? <label>{componentAttrs.label}</label> : ''}
{label ? <label>{label}</label> : ''}
<div className="helpText">{help}</div>
<input type={componentAttrs.type} bidi={this.setting(setting)} {...componentAttrs} />
<input type={type} bidi={this.setting(setting)} {...componentAttrs} />
</div>
);
}