Fix redirections in Admin Console

Signed-off-by:Ondro Mihalyi <mihalyi@omnifish.ee>
eclipse-ee4j · Apr 22, 2023 · d64fe7d · d64fe7d
1 parent f9fc011
commit d64fe7d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/appserver/admingui/common/src/main/resources/applications/deployTableButtons.inc b/appserver/admingui/common/src/main/resources/applications/deployTableButtons.inc
@@ -35,7 +35,7 @@
                 getUIComponent(clientId="$pageSession{tableRowGroupId}", component=>$attribute{tableRowGroup});
                 getSelectedSingleMapRows(TableRowGroup="$attribute{tableRowGroup}" selectedRows=>$attribute{selectedRows});
                 gf.undeploy(selectedRows="${selectedRows}" );
-                gf.navigate(page="#{listPageLink}");
+                gf.redirect(page="#{listPageLink}");
             />
          </sun:button>
         <sun:button id="button2" text="$resource{i18n.button.Enable}" rendered="#{pageSession.onlyDASExist}" disabled="#{true}" primary="#{false}"

diff --git a/appserver/admingui/common/src/main/resources/js/adminjsf.js b/appserver/admingui/common/src/main/resources/js/adminjsf.js
@@ -19,12 +19,19 @@
  * Common utility
  */
 
-require(['webui/suntheme/field']);
-require(['webui/suntheme/dropDown']);
-require(['webui/suntheme/upload']);
-require(['webui/suntheme/jumpDropDown']);
-require(['webui/suntheme/hyperlink']);
-require(['webui/suntheme/props']);
+if (require) {
+    /* Don't load dependencies eagerly if require is not available. 
+     * Allows using adminjsf without loading dojo for the require function,
+     * in cases when only basic functionality is needed. For example in removeFrame.jsf.
+     */
+
+    require(['webui/suntheme/field']);
+    require(['webui/suntheme/dropDown']);
+    require(['webui/suntheme/upload']);
+    require(['webui/suntheme/jumpDropDown']);
+    require(['webui/suntheme/hyperlink']);
+    require(['webui/suntheme/props']);
+}
 
 function checkPSWInCommon(secureAdminEnabled, id1, id2, alert1, alert2, confirmMessage) {
 	var ps1 = document.getElementById(id1);