diff --git a/CHANGELOG.md b/CHANGELOG.md index d08e96c5d..717fd90dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,8 @@ * Adapt settings options for using number gernerator. Refs UIIN-2556. * Hide version history icon and settings if audit log feature is disabled. Refs UIIN-3231. * Provide ids _and `length` param_ when retrieving job profiles. Refs UIIN-3257. +* Move ‘Set for deletion’ checkbox field to 4th space in top row of Instance Edit view. Refs UIIN-3259. +* Update Inventory: Set records for deletion permission's effect on ‘Set for deletion’ checkbox in Instance Edit view. Refs UIIN-3260. * *BREAKING* Migrate stripes dependencies to their Sunflower versions. Refs UIIN-3223. * *BREAKING* Migrate `react-intl` to v7. Refs UIIN-3224. diff --git a/src/edit/InstanceForm.js b/src/edit/InstanceForm.js index deb243cb4..467a34220 100644 --- a/src/edit/InstanceForm.js +++ b/src/edit/InstanceForm.js @@ -198,6 +198,7 @@ class InstanceForm extends React.Component { connect: PropTypes.func.isRequired, locale: PropTypes.string.isRequired, logger: PropTypes.object.isRequired, + hasPerm: PropTypes.func.isRequired, }).isRequired, resources: PropTypes.shape({ instanceBlockedFields: PropTypes.shape({ @@ -536,16 +537,6 @@ class InstanceForm extends React.Component { } - - } - name="deleted" - component={Checkbox} - type="checkbox" - disabled={this.isFieldBlocked('deleted')} - onChange={() => this.onSetForDeletionFieldChange()} - /> - } @@ -576,6 +567,17 @@ class InstanceForm extends React.Component { disabled={this.isFieldBlocked('previouslyHeld')} /> + + } + name="deleted" + component={Checkbox} + type="checkbox" + disabled={this.isFieldBlocked('deleted') + || !this.props.stripes.hasPerm('ui-inventory.instance.set-records-for-deletion.execute')} + onChange={() => this.onSetForDeletionFieldChange()} + /> +