feat(actionlet): rollback the ajax method and change executeAction (#…

…28579)
dotCMS · Oct 16, 2024 · 8d4f2d7 · 8d4f2d7
1 parent 93743ae
commit 8d4f2d7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/dotCMS/src/main/java/com/dotmarketing/business/ajax/PermissionAjax.java b/dotCMS/src/main/java/com/dotmarketing/business/ajax/PermissionAjax.java
@@ -350,7 +350,7 @@ public void resetAssetPermissions (String assetId, Long languageId) throws DotDa
 	}
 
 	@CloseDBIfOpened
-	public static Permissionable retrievePermissionable (String assetId, Long language, User user, boolean respectFrontendRoles) throws DotDataException, DotSecurityException {
+	private Permissionable retrievePermissionable (String assetId, Long language, User user, boolean respectFrontendRoles) throws DotDataException, DotSecurityException {
 
 		HostAPI hostAPI = APILocator.getHostAPI();
 		Permissionable perm = null;

diff --git a/...rc/main/java/com/dotmarketing/portlets/workflows/actionlet/ResetPermissionsActionlet.java b/...rc/main/java/com/dotmarketing/portlets/workflows/actionlet/ResetPermissionsActionlet.java
@@ -47,15 +47,14 @@ public void executeAction(WorkflowProcessor processor, Map<String, WorkflowActio
         try {
 
             User user = processor.getUser();
-            boolean respectFrontendRoles = user.isBackendUser();
 
             PermissionAPI permissionAPI = APILocator.getPermissionAPI();
-            Permissionable asset = PermissionAjax.retrievePermissionable(processor.getContentlet().getIdentifier(), processor.getContentlet().getLanguageId(), user, respectFrontendRoles);
             PermissionBitAPIImpl api = (PermissionBitAPIImpl) APILocator.getPermissionAPI();
-            if (!api.doesUserHavePermission(asset, PermissionAPI.PERMISSION_EDIT_PERMISSIONS, user)) {
-                if (!api.checkIfContentletTypeHasEditPermissions(asset, user)) {
+            Permissionable asset = processor.getContentlet();
+            if (!user.isAdmin() && !api.doesUserHavePermission(asset, PermissionAPI.PERMISSION_EDIT_PERMISSIONS, user) &&
+                    !api.checkIfContentletTypeHasEditPermissions(asset, user)) {
+
                     throw new DotSecurityException("User id: " + user.getUserId() + " does not have permission to alter permissions on asset " + asset.getPermissionId());
-                }
             }
             permissionAPI.removePermissions(asset);
         } catch ( Exception e) {