Alexander Wels has uploaded a new change for review. Change subject: userportal,webadmin: remove double slash in link ......................................................................
userportal,webadmin: remove double slash in link Due to some of the URI rework, the base URI has a starting slash, but some of the code assumed it didn't this patch adds method to get the base URI without the leading slash. Change-Id: Ica1ee3cce0c98dffe781b7d0e9ec5c2d667b4acd Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1026593 Signed-off-by: Alexander Wels <[email protected]> --- M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/utils/BaseContextPathData.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java 4 files changed, 12 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/31/20931/1 diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/utils/BaseContextPathData.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/utils/BaseContextPathData.java index 0a7ae17..a456cc0 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/utils/BaseContextPathData.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/utils/BaseContextPathData.java @@ -18,4 +18,11 @@ return this.value; }-*/; + public String getRelativePath() { + String path = getPath(); + if (path.startsWith("/")) { //$NON-NLS-1$ + path = path.substring(1); + } + return path; + } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java index cf16cd8..2d70c9d 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java @@ -7,7 +7,7 @@ public class NoVncImpl extends AbstractVnc implements INoVnc { - private static final String CLIENT_PAGE = BaseContextPathData.getInstance().getPath() + private static final String CLIENT_PAGE = BaseContextPathData.getInstance().getRelativePath() + "services/novnc-main.html"; //$NON-NLS-1$ private final WebsocketProxyConfig config; diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java index 123a73c..180ecee 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java @@ -7,7 +7,7 @@ public class SpiceHtml5Impl extends AbstractSpice implements ISpiceHtml5 { - private static final String CLIENT_PAGE = BaseContextPathData.getInstance().getPath() + private static final String CLIENT_PAGE = BaseContextPathData.getInstance().getRelativePath() + "services/spicehtml5-main.html"; //$NON-NLS-1$ private final WebsocketProxyConfig config; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java index 69d6992..0325911 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java @@ -4,8 +4,8 @@ import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.INewAsyncCallback; -import org.ovirt.engine.ui.frontend.utils.FrontendUrlUtils; import org.ovirt.engine.ui.frontend.utils.BaseContextPathData; +import org.ovirt.engine.ui.frontend.utils.FrontendUrlUtils; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.vms.ISpice; import org.ovirt.engine.ui.uicompat.Event; @@ -25,7 +25,7 @@ public abstract class Configurator { private static final String DOCUMENTATION_LIB_PATH = "html/"; //$NON-NLS-1$ - private static final String DOCUMENTATION_ROOT = BaseContextPathData.getInstance().getPath() + private static final String DOCUMENTATION_ROOT = BaseContextPathData.getInstance().getRelativePath() + "docs/manual"; //$NON-NLS-1$ private static String documentationLangPath; @@ -197,7 +197,7 @@ * Returns the base URL for retrieving Spice-related resources. */ public static String getSpiceBaseURL() { - return FrontendUrlUtils.getRootURL() + BaseContextPathData.getInstance().getPath() + return FrontendUrlUtils.getRootURL() + BaseContextPathData.getInstance().getRelativePath() + "services/files/spice/"; //$NON-NLS-1$ } -- To view, visit http://gerrit.ovirt.org/20931 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ica1ee3cce0c98dffe781b7d0e9ec5c2d667b4acd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
