diff --git a/CHANGELOG.md b/CHANGELOG.md index 5aabfd0..77e8e7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ * [UITEN-316](https://folio-org.atlassian.net/browse/UITEN-316) Fix code to pass ESLint successfully. * [UITEN-314](https://folio-org.atlassian.net/browse/UITEN-314) Settings > Tenant > Locations setup > Locations. Enable and Display floating collection. * [UITEN-317](https://folio-org.atlassian.net/browse/UITEN-317) Settings > Tenant > Locations setup > Locations. Display in detailed view when floating collection is enabled or not enabled. -* [UITEN-318](https://folio-org.atlassian.net/browse/UITEN-318) Permissions. Settings (tenant). View and be able to enable to set floating collection +* [UITEN-318](https://folio-org.atlassian.net/browse/UITEN-318) Settings > Tenant > Locations setup > Locations. Permissions govern viewing and editing floating collection. ## [9.0.0](https://github.com/folio-org/ui-tenant-settings/tree/v9.0.0)(2024-10-30) diff --git a/package.json b/package.json index 7b0f9e9..5077182 100644 --- a/package.json +++ b/package.json @@ -193,7 +193,8 @@ "permissionName": "ui-tenant-settings.settings.location.floating.edit", "displayName": "Settings (tenant): Can view and edit floating collection flag", "subPermissions": [ - "ui-tenant-settings.settings.location" + "ui-tenant-settings.settings.location", + "ui-tenant-settings.settings.location.floating.view" ], "visible": true }, diff --git a/src/settings/LocationLocations/LocationDetail.js b/src/settings/LocationLocations/LocationDetail.js index 17c61d6..6150adc 100644 --- a/src/settings/LocationLocations/LocationDetail.js +++ b/src/settings/LocationLocations/LocationDetail.js @@ -278,18 +278,20 @@ const LocationDetail = ({ - - - } - > - {loc.isFloatingCollection ? - : - - } - - - + + + + } + > + {loc.isFloatingCollection ? + : + + } + + + + -

Floating collection

- - - } - name="isFloatingCollection" - id="input-location-floating" - component={Checkbox} - type="checkbox" - /> -
- -
+ +

Floating collection

+ + + } + name="isFloatingCollection" + id="input-location-floating" + component={Checkbox} + type="checkbox" + /> +
+ +
+
{ return { sort, sortDir }; }; -const locationListVisibleColumns = ['isActive', 'name', 'code', 'isFloatingCollection']; - const locationListColumnMapping = { isActive: , name: , @@ -407,6 +405,11 @@ const LocationManager = ({ label }) => { const container = document.getElementById('ModuleContainer'); if (!container) return (
); + const locationListVisibleColumns = ['isActive', 'name', 'code']; + if (stripes.hasPerm('ui-tenant-settings.settings.location.floating.view')) { + locationListVisibleColumns.push('isFloatingCollection'); + } + return (