LPS-193573 Allow delete system fields only by allowed bundles

gabrielwas · Aug 23, 2023 · 0b10012 · 0b10012
1 parent 648f326
commit 0b10012
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/...in/java/com/liferay/object/admin/rest/internal/resource/v1_0/ObjectFieldResourceImpl.java b/...in/java/com/liferay/object/admin/rest/internal/resource/v1_0/ObjectFieldResourceImpl.java
@@ -320,7 +320,9 @@ private ObjectField _toObjectField(
 				HashMapBuilder.put(
 					"delete",
 					() -> {
-						if (!objectField.isDeletionAllowed()) {
+						if (!objectField.isDeletionAllowed() ||
+							objectField.isSystem()) {
+
 							return null;
 						}
 

diff --git a/...ps/object/object-service/src/main/java/com/liferay/object/model/impl/ObjectFieldImpl.java b/...ps/object/object-service/src/main/java/com/liferay/object/model/impl/ObjectFieldImpl.java
@@ -49,7 +49,7 @@ public List<ObjectFieldSetting> getObjectFieldSettings() {
 
 	@Override
 	public boolean isDeletionAllowed() throws PortalException {
-		if (isSystem() || Validator.isNotNull(getRelationshipType())) {
+		if (Validator.isNotNull(getRelationshipType())) {
 			return false;
 		}
 
@@ -62,12 +62,6 @@ public boolean isDeletionAllowed() throws PortalException {
 			return false;
 		}
 
-		if (objectDefinition.isApproved() && objectDefinition.isModifiable() &&
-			objectDefinition.isSystem()) {
-
-			return false;
-		}
-
 		return true;
 	}
 

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
@@ -983,9 +983,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();
 		}