upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix ABAC not available for entry (#34027)

Browse source 
Automatic Merge
This commit is contained in:
Maria A Nunez 2025-10-02 05:06:17 -04:00 committed by GitHub
parent e5fbe65a0b
commit 7532e5988a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
webapp/channels/src/components/admin_console/admin_definition.tsx
View file

@ -628,7 +628,7 @@ const AdminDefinition: AdminDefinitionType = {
url: `system_attributes/attribute_based_access_control/edit_policy/:policy_id(${ID_PATH_PATTERN})`,
isHidden: it.any(
it.configIsFalse('AccessControlSettings', 'EnableAttributeBasedAccessControl'),
it.not(it.licensedForSku(LicenseSkus.EnterpriseAdvanced)),
it.not(it.minLicenseTier(LicenseSkus.EnterpriseAdvanced)),
it.not(it.userHasReadPermissionOnResource(RESOURCE_KEYS.USER_MANAGEMENT.SYSTEM_ROLES)),
),
isDisabled: it.any(
@ -644,7 +644,7 @@ const AdminDefinition: AdminDefinitionType = {
url: 'system_attributes/attribute_based_access_control/edit_policy',
isHidden: it.any(
it.configIsFalse('AccessControlSettings', 'EnableAttributeBasedAccessControl'),
it.not(it.licensedForSku(LicenseSkus.EnterpriseAdvanced)),
it.not(it.minLicenseTier(LicenseSkus.EnterpriseAdvanced)),
it.not(it.userHasReadPermissionOnResource(RESOURCE_KEYS.USER_MANAGEMENT.SYSTEM_ROLES)),
it.configIsFalse('FeatureFlags', 'AttributeBasedAccessControl'),
),
@ -3257,7 +3257,7 @@ const AdminDefinition: AdminDefinitionType = {
url: 'site_config/content_flagging',
title: defineMessage({id: 'admin.sidebar.contentFlagging', defaultMessage: 'Content Flagging'}),
isHidden: it.any(
it.not(it.licensedForSku(LicenseSkus.EnterpriseAdvanced)),
it.not(it.minLicenseTier(LicenseSkus.EnterpriseAdvanced)),
it.not(it.userHasReadPermissionOnResource(RESOURCE_KEYS.USER_MANAGEMENT.SYSTEM_ROLES)),
it.configIsFalse('FeatureFlags', 'ContentFlagging'),
),