Frank Kobzik has uploaded a new change for review. Change subject: frontend: Console client page url retrieval ......................................................................
frontend: Console client page url retrieval Retrieving console client resources page should differentiate between absolute and relative links. Change-Id: Ib8da4313e8fa6bf4a3f170750ab6fab0d21869ea Signed-off-by: Frantisek Kobzik <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java 1 file changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/24003/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java index ccab3e9..0d4a22e 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/utils/DynamicMessages.java @@ -1,5 +1,6 @@ package org.ovirt.engine.ui.common.utils; +import com.google.gwt.user.client.Window; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -13,6 +14,7 @@ import com.google.gwt.i18n.client.LocaleInfo; import com.google.gwt.regexp.shared.MatchResult; import com.google.gwt.regexp.shared.RegExp; +import org.ovirt.engine.ui.frontend.utils.BaseContextPathData; /** * Contains dynamic messages available to the application. @@ -315,7 +317,13 @@ * @return The console client resources page url. */ public final String consoleClientResourcesUrl() { - return getString(DynamicMessageKey.CONSOLE_CLIENT_RESOURCES_URL); + String url = getString(DynamicMessageKey.CONSOLE_CLIENT_RESOURCES_URL); + boolean isAbsolute = url.contains("://"); + + return isAbsolute + ? url + : Window.Location.getProtocol() + "//" + Window.Location.getHost() + //$NON-NLS-1$ + "/" + BaseContextPathData.getInstance().getRelativePath() + url; //$NON-NLS-1$ } /** -- To view, visit http://gerrit.ovirt.org/24003 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8da4313e8fa6bf4a3f170750ab6fab0d21869ea Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
