diff --git a/dotCMS/src/main/webapp/html/portlet/ext/common/edit_permissions_tab_inc.jsp b/dotCMS/src/main/webapp/html/portlet/ext/common/edit_permissions_tab_inc.jsp index 86c33f365e53..af28805a9816 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/common/edit_permissions_tab_inc.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/common/edit_permissions_tab_inc.jsp @@ -104,7 +104,7 @@ -
" style="display: none;"> +
" style="display: none;">
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/common/edit_permissions_tab_inc_ajax.jsp b/dotCMS/src/main/webapp/html/portlet/ext/common/edit_permissions_tab_inc_ajax.jsp index 5d7bb2816065..c66bed43090c 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/common/edit_permissions_tab_inc_ajax.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/common/edit_permissions_tab_inc_ajax.jsp @@ -86,7 +86,7 @@
-
" style="display: none;"> +
" style="display: none;">
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 index fd8a3224e8b0..2dfbfdecc8fe 100644 --- 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 @@ -113,19 +113,19 @@ function preloadingPermissions(){ try { //dwr.util.useLoadingMessage(); - dojo.style(dijit.byId('savingPermissionsDialog').closeButtonNode, 'visibility', 'hidden'); loadPermissions(); } catch(err){ //console.log("error",err) } } -setTimeout(loadPermissions, 0); -setTimeout(loadPermissions, 500); -setTimeout(loadPermissions, 1000); var permissionsLoaded = false; //Initialization - dojo.addOnLoad(preloadingPermissions); +require(['dojo/ready'], function(ready){ + ready(function() { + preloadingPermissions(); + }); +}); diff --git a/dotCMS/src/main/webapp/html/portlet/ext/roleadmin/view_role_permissions_inc.jsp b/dotCMS/src/main/webapp/html/portlet/ext/roleadmin/view_role_permissions_inc.jsp index 70bd0c0ac696..414836eb364d 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/roleadmin/view_role_permissions_inc.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/roleadmin/view_role_permissions_inc.jsp @@ -36,11 +36,6 @@
-
" style="display: none;"> +
" style="display: none;">
-
- \ No newline at end of file +
\ No newline at end of file diff --git a/hotfix_tracking.md b/hotfix_tracking.md index 018449c012c3..f258e183b0af 100644 --- a/hotfix_tracking.md +++ b/hotfix_tracking.md @@ -28,4 +28,5 @@ This maintenance release includes the following code fixes: 19. https://github.com/dotCMS/core/issues/24395 : Remove issuer check from JWT API keys #24395 20. https://github.com/dotCMS/core/issues/24436 : Task05380ChangeContainerPathToAbsolute repeating site if container was added several times 21. https://github.com/dotCMS/core/issues/24441 : Unable to copy a folder when the folder contains a page that has two versions live and draft #24441 -22. https://github.com/dotCMS/core/issues/24245 : Publishing contentlet takes a long time when there are many locales/relationships #24245 \ No newline at end of file +22. https://github.com/dotCMS/core/issues/24245 : Publishing contentlet takes a long time when there are many locales/relationships #24245 +23. https://github.com/dotCMS/core/issues/23889 : Design Template Permissions Tab Doesn't Load #23889 \ No newline at end of file