From 06908792c8bb950433f0f2473221825ecfb163c5 Mon Sep 17 00:00:00 2001
From: erickgonzalez <erick.gonzalez@dotcms.com>
Date: Wed, 14 Aug 2024 10:54:15 -0600
Subject: [PATCH] #28838 include in 23.10.24 LTS

---
 dotCMS/hotfix_tracking.md                                      | 3 ++-
 .../java/com/dotmarketing/business/ajax/PermissionAjax.java    | 2 +-
 .../src/main/java/com/dotmarketing/factories/InodeFactory.java | 3 +++
 dotCMS/src/main/java/com/dotmarketing/util/InodeUtils.java     | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md
index 3f58f8181482..b630c84d8f06 100644
--- a/dotCMS/hotfix_tracking.md
+++ b/dotCMS/hotfix_tracking.md
@@ -138,4 +138,5 @@ This maintenance release includes the following code fixes:
 131. https://github.com/dotCMS/core/issues/27816 : Content Displacement Bug when Editing Template #27816
 132. https://github.com/dotCMS/core/issues/28163 : 'alive' and 'startup' healthcheck APIs return 503 on seemingly healthy app #28163
 133. https://github.com/dotCMS/core/issues/26546 : Enable better logging for getPageByPath in HTMLPageAssetAPIImpl.java #26546
-134. https://github.com/dotCMS/core/issues/28366 : Uploaded images in another language than the default one do not inherit permissions #28366
\ No newline at end of file
+134. https://github.com/dotCMS/core/issues/28366 : Uploaded images in another language than the default one do not inherit permissions #28366
+135. https://github.com/dotCMS/core/issues/28838 : Category Child Permissions Not Loading #28838
\ No newline at end of file
diff --git a/dotCMS/src/main/java/com/dotmarketing/business/ajax/PermissionAjax.java b/dotCMS/src/main/java/com/dotmarketing/business/ajax/PermissionAjax.java
index 9fbb49d54021..690cb0a62346 100644
--- a/dotCMS/src/main/java/com/dotmarketing/business/ajax/PermissionAjax.java
+++ b/dotCMS/src/main/java/com/dotmarketing/business/ajax/PermissionAjax.java
@@ -157,7 +157,7 @@ private void addPermissionToRoleList(Permissionable perm, Permission p, Map<Stri
 						    permParent = InodeUtils.getInode(assetInode);
 						}
 
-						if(permParent !=null || InodeUtils.isSet(permParent.getPermissionId())){
+						if(permParent !=null && InodeUtils.isSet(permParent.getPermissionId())){
 							inodeCache.put(permParent.getPermissionId(), permParent);
 
 						}
diff --git a/dotCMS/src/main/java/com/dotmarketing/factories/InodeFactory.java b/dotCMS/src/main/java/com/dotmarketing/factories/InodeFactory.java
index 9aec749e6f24..2d6f0ed642d0 100644
--- a/dotCMS/src/main/java/com/dotmarketing/factories/InodeFactory.java
+++ b/dotCMS/src/main/java/com/dotmarketing/factories/InodeFactory.java
@@ -147,6 +147,9 @@ public static Inode getInode(String x, Class c) {
 		if(c.equals(Folder.class)){
 			throw new DotStateException("Folder mapping was deleted from hibernate files");
 		}
+		if (c.equals(Category.class)){
+			throw new DotStateException("Category mapping was deleted from hibernate files");
+		}
 		
 		
 		
diff --git a/dotCMS/src/main/java/com/dotmarketing/util/InodeUtils.java b/dotCMS/src/main/java/com/dotmarketing/util/InodeUtils.java
index c8401cac2aa7..3c60c81b1018 100644
--- a/dotCMS/src/main/java/com/dotmarketing/util/InodeUtils.java
+++ b/dotCMS/src/main/java/com/dotmarketing/util/InodeUtils.java
@@ -198,6 +198,8 @@ public static Inode getInode(final String inode) throws DotDataException, DotSec
 		}else if ( shortOpt.isPresent() && ShortType.FOLDER == shortOpt.get().subType ) {
 			//Folder no longer inherit from inode, returning an empty inode
 			inodeObj = new Inode();
+		} else if ( shortOpt.isPresent() && ShortType.CATEGORY == shortOpt.get().subType ) {
+			inodeObj = APILocator.getCategoryAPI().find(inode, APILocator.systemUser(), false);
 		} else {
             inodeObj = InodeFactory.getInode(inode, Inode.class);
         }