Tomas Jelinek has uploaded a new change for review. Change subject: frontend: remote-viewrt version check ......................................................................
frontend: remote-viewrt version check Change-Id: I5b42e072926ad097e62d41360f9f08446132261f Signed-off-by: Tomas Jelinek <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java 2 files changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/41949/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java index 85584b8..c2e681a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/SpiceConsoleModel.java @@ -5,7 +5,6 @@ import java.util.Collections; import java.util.List; -import com.google.gwt.user.client.Window; import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters; import org.ovirt.engine.core.common.action.RunVmParams; import org.ovirt.engine.core.common.action.ShutdownVmParameters; @@ -31,8 +30,10 @@ import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; +import org.ovirt.engine.ui.frontend.utils.FrontendUrlUtils; import org.ovirt.engine.ui.uicommonweb.BaseCommandTarget; import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; +import org.ovirt.engine.ui.uicommonweb.DynamicMessages; import org.ovirt.engine.ui.uicommonweb.ILogger; import org.ovirt.engine.ui.uicommonweb.TypeResolver; import org.ovirt.engine.ui.uicommonweb.UICommand; @@ -54,6 +55,8 @@ public static EventDefinition spiceDisconnectedEventDefinition; public static EventDefinition spiceConnectedEventDefinition; public static EventDefinition spiceMenuItemSelectedEventDefinition; + + private static final DynamicMessages dynamicMessages = (DynamicMessages) TypeResolver.getInstance().resolve(DynamicMessages.class); private SpiceMenu menu; @@ -304,7 +307,9 @@ options.setVmId(getEntity().getId()); // configure options ConfigureConsoleOptionsParams parameters = new ConfigureConsoleOptionsParams(options, true); - parameters.setEngineBaseUrl(Window.Location.getHost()); + parameters.setEngineBaseUrl(FrontendUrlUtils.getRootURL()); + parameters.setConsoleClientResourcesUrl(dynamicMessages.consoleClientResourcesUrl()); + Frontend.getInstance().runQuery( VdcQueryType.ConfigureConsoleOptions, parameters, diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java index 230ba76..14c2a48 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VncConsoleModel.java @@ -1,6 +1,5 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; -import com.google.gwt.user.client.Window; import org.ovirt.engine.core.common.businessentities.GraphicsInfo; import org.ovirt.engine.core.common.businessentities.GraphicsType; import org.ovirt.engine.core.common.businessentities.VM; @@ -12,8 +11,10 @@ import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; +import org.ovirt.engine.ui.frontend.utils.FrontendUrlUtils; import org.ovirt.engine.ui.uicommonweb.BaseCommandTarget; import org.ovirt.engine.ui.uicommonweb.ConsoleUtils; +import org.ovirt.engine.ui.uicommonweb.DynamicMessages; import org.ovirt.engine.ui.uicommonweb.TypeResolver; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; @@ -24,6 +25,8 @@ public class VncConsoleModel extends ConsoleModel { public enum ClientConsoleMode { Native, NoVnc } + + private static final DynamicMessages dynamicMessages = (DynamicMessages) TypeResolver.getInstance().resolve(DynamicMessages.class); private ClientConsoleMode consoleMode; private IVnc vncImpl; @@ -110,7 +113,8 @@ vncImpl.getOptions().setVmId(getEntity().getId()); ConfigureConsoleOptionsParams parameters = new ConfigureConsoleOptionsParams(vncImpl.getOptions(), true); - parameters.setEngineBaseUrl(Window.Location.getHost()); + parameters.setEngineBaseUrl(FrontendUrlUtils.getRootURL()); + parameters.setConsoleClientResourcesUrl(dynamicMessages.consoleClientResourcesUrl()); Frontend.getInstance().runQuery( VdcQueryType.ConfigureConsoleOptions, parameters, -- To view, visit https://gerrit.ovirt.org/41949 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b42e072926ad097e62d41360f9f08446132261f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
