Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(xo-web/XOSTOR): move 'ignore file sytems' outside of advanced settings #7429

Merged
merged 3 commits into from
Mar 4, 2024
Merged

fix(xo-web/XOSTOR): move 'ignore file sytems' outside of advanced settings #7429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe3bb49
fix(xo-web/XOSTOR): move 'ignore file sytems' outside of advanced set…
MathieuRA Mar 1, 2024
b89870a
changelog
MathieuRA Mar 1, 2024
1dae853
Merge branch 'master' into xostor-ignore-fs
pdonias Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
> Users must be able to say: “I had this issue, happy to know it's fixed”
- [Jobs] Fix `t.value is undefined` when saving a new job (broken in XO 5.91)
- [XOSTOR] Move `ignore file sytems` outside of advanced settings (PR [#7429](https://github.com/vatesfr/xen-orchestra/pull/7429))

### Packages to release

Expand Down
20 changes: 10 additions & 10 deletions packages/xo-web/src/xo-app/xostor/new-xostor-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ const SettingsCard = decorate([
<Card>
<CardHeader>
{_('settings')}
<ActionButton
{/* Uncomment when some advanced settings need to be added */}
{/* <ActionButton
className='pull-right'
data-mode='_displayAdvancedSettings'
handler={effects.toggleDisplayAdvancedSettings}
Expand All @@ -120,7 +121,7 @@ const SettingsCard = decorate([
size='small'
>
{_('advancedSettings')}
</ActionButton>
</ActionButton> */}
</CardHeader>
<CardBlock>
<Row>
Expand All @@ -140,14 +141,13 @@ const SettingsCard = decorate([
<Select onChange={effects.onProvisioningChange} options={PROVISIONING_OPTIONS} value={state.provisioning} />
</Col>
</Row>
{state.displayAdvancedSettings && (
<Row>
<Col style={SPACE_BETWEEN}>
<label>{_('ignoreFileSystems')}</label>
<Toggle value={state.ignoreFileSystems} onChange={effects.onIgnoreFileSystemsChange} size='small' />
</Col>
</Row>
)}
<Row className='form-group mt-1'>
<Col style={SPACE_BETWEEN}>
<label>{_('ignoreFileSystems')}</label>
<Toggle value={state.ignoreFileSystems} onChange={effects.onIgnoreFileSystemsChange} size='small' />
</Col>
</Row>
{/* {state.displayAdvancedSettings && ( Advanced settings section )} */}
</CardBlock>
</Card>
),
Expand Down