#28814 include in 23.10.24 LTS

dotCMS · Sep 23, 2024 · 91ee025 · 91ee025
1 parent 56f139b
commit 91ee025
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md
@@ -154,3 +154,4 @@ This maintenance release includes the following code fixes:
 147. https://github.com/dotCMS/core/issues/29213 : Copying a contentlet without having Edit Permissions causes copy to have incorrect permissions. #29213
 148. https://github.com/dotCMS/core/issues/28580 : fix: avoid NPE on Patch WF API when there is not any contentlet map #28580
 149. https://github.com/dotCMS/core/issues/28489 : Creating new content don't respect language selected #28489
+150. https://github.com/dotCMS/core/issues/28814 : Rules permission checkbox is not visible #28814
diff --git a/...src/main/webapp/html/portlet/ext/common/edit_permissions_accordion_contentType_entry.html b/...src/main/webapp/html/portlet/ext/common/edit_permissions_accordion_contentType_entry.html
@@ -1,4 +1,4 @@
-<table class="accordionEntry" style="margin-top:-10px;">
+<table class="accordionEntry">
 
     <tr>
         <th style="padding-left:20px;" class="permissionType">${contentWillInherit} (Children)</th>
@@ -11,4 +11,4 @@
     <tr>
         <td colspan="6" style="padding-top:18px;font-style:italic;font-size:93%">${permissionsOnContentTypeChildren}</td>
     </tr>
-</table>
+</table>
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/common/edit_permissions_tab_js_inc.jsp b/dotCMS/src/main/webapp/html/portlet/ext/common/edit_permissions_tab_js_inc.jsp
@@ -216,7 +216,7 @@
 
 				// Memo size to make displayed child
 				this._containerContentBox = {
-					h: this._verticalSpace,
+					h: 'auto',
 					w: mySize.w
 				};
 

diff --git a/dotCMS/src/main/webapp/html/portlet/ext/roleadmin/view_role_permissions_js_inc.jsp b/dotCMS/src/main/webapp/html/portlet/ext/roleadmin/view_role_permissions_js_inc.jsp
@@ -242,7 +242,7 @@
 		container.startup();
 
 		var selectedChildPaneId = systemHost.identifier;
-		var myHeight = 428;
+		var myHeight = 500;
 		for(var i = 0; i < data.length; i++) {
 			var id = data[i].type=='host'?data[i].identifier:data[i].inode;
 			if(id != systemHost.identifier)