LPS-193573 Allow delete system fields only by allowed bundles

gabrielwas · Aug 23, 2023 · f47f5fd · f47f5fd
1 parent 765886e
commit f47f5fd
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/...ct-service/src/main/java/com/liferay/object/service/impl/ObjectFieldLocalServiceImpl.java b/...ct-service/src/main/java/com/liferay/object/service/impl/ObjectFieldLocalServiceImpl.java
@@ -982,9 +982,8 @@ else if (!deleteRelationshipObjectField) {
 			throw new RequiredObjectFieldException();
 		}
 
-		if (FeatureFlagManagerUtil.isEnabled("LPS-190890") &&
-			objectDefinition.isApproved() && objectDefinition.isModifiable() &&
-			objectDefinition.isSystem()) {
+		if (objectField.isSystem() && objectDefinition.isModifiable() &&
+			!SystemUtil.allowManageSystemEntities()) {
 
 			throw new UnsupportedOperationException();
 		}