#23889 include in 23.01.2

dotCMS · Apr 4, 2023 · 3c6c6b0 · 3c6c6b0
1 parent 8569977
commit 3c6c6b0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
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
@@ -104,7 +104,7 @@
 </div>
 
 <!-- START Saving permissions dialog -->
-	<div id="savingPermissionsDialog" dojoType="dijit.Dialog" title="<%= LanguageUtil.get(pageContext, "saving-permissions") %>" style="display: none;">
+	<div id="savingPermissionsDialog" data-dojo-props="closable:false" dojoType="dijit.Dialog" title="<%= LanguageUtil.get(pageContext, "saving-permissions") %>" style="display: none;">
 		<div dojoType="dijit.ProgressBar" style="width:200px;text-align:center;" indeterminate="true"></div>
 	</div>
 <!-- END Saving permissions dialog -->

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
@@ -86,7 +86,7 @@
 </div>
 
 <!-- START Saving permissions dialog -->
-	<div id="savingPermissionsDialog" dojoType="dijit.Dialog" title="<%= LanguageUtil.get(pageContext, "saving-permissions") %>" style="display: none;">
+	<div id="savingPermissionsDialog" dojoType="dijit.Dialog" data-dojo-props="closable:false" title="<%= LanguageUtil.get(pageContext, "saving-permissions") %>" style="display: none;">
 		<div dojoType="dijit.ProgressBar" style="width:200px;text-align:center;" indeterminate="true"></div>
 	</div>
 <!-- END Saving permissions dialog -->

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
@@ -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
@@ -36,11 +36,6 @@
 	</div>
 
 </div>
-<div id="savingPermissionsDialog" dojoType="dijit.Dialog" title="<%= LanguageUtil.get(pageContext, "saving-permissions") %>" style="display: none;">
+<div id="savingPermissionsDialog" data-dojo-props="closable:false" dojoType="dijit.Dialog" title="<%= LanguageUtil.get(pageContext, "saving-permissions") %>" style="display: none;">
 	<div dojoType="dijit.ProgressBar" style="width:200px;text-align:center;" indeterminate="true" jsId="savePermissions" id="savePermissions"></div>
-</div>
-<script type="text/javascript">
-	dojo.addOnLoad(function () {
-		dojo.style(dijit.byId('savingPermissionsDialog').closeButtonNode, 'visibility', 'hidden');
-	});
-</script>
+</div>
diff --git 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
+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