Alexander Wels has uploaded a new change for review. Change subject: webadmin: host->general->hardware jumps to VM ......................................................................
webadmin: host->general->hardware jumps to VM - Because the host hardware is no longer its own sub tab it no longer has a place. So when switching to a different host it would try and switch to the hardware sub tab. This patch makes sure that we stay on the general sub tab instead. Change-Id: I47f1ece04f1112ecbe00b6a4a9a4c0518d297ede Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1217579 Signed-off-by: Alexander Wels <aw...@redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractMainTabWithDetailsPresenter.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/MainTabHostPresenter.java 2 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/10/41610/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractMainTabWithDetailsPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractMainTabWithDetailsPresenter.java index 3dfb1c6..7c3382a 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractMainTabWithDetailsPresenter.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/AbstractMainTabWithDetailsPresenter.java @@ -99,7 +99,7 @@ */ protected abstract void fireTableSelectionChangeEvent(); - PlaceRequest getSubTabRequest() { + protected PlaceRequest getSubTabRequest() { String subTabName = modelProvider.getModel().getActiveDetailModel().getHashName(); String requestToken = getMainTabRequest().getNameToken() + WebAdminApplicationPlaces.SUB_TAB_PREFIX + subTabName; return PlaceRequestFactory.get(requestToken); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/MainTabHostPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/MainTabHostPresenter.java index aecc6d4..fb74e3c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/MainTabHostPresenter.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/MainTabHostPresenter.java @@ -6,6 +6,8 @@ import org.ovirt.engine.ui.common.place.PlaceRequestFactory; import org.ovirt.engine.ui.common.uicommon.model.MainModelProvider; import org.ovirt.engine.ui.common.widget.tab.ModelBoundTabData; +import org.ovirt.engine.ui.uicommonweb.models.HasEntity; +import org.ovirt.engine.ui.uicommonweb.models.hosts.HostHardwareGeneralModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.HostListModel; import org.ovirt.engine.ui.uicommonweb.place.WebAdminApplicationPlaces; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -65,4 +67,18 @@ return PlaceRequestFactory.get(WebAdminApplicationPlaces.hostMainTabPlace); } + @Override + protected PlaceRequest getSubTabRequest() { + HasEntity<VDS> activeDetailModel = modelProvider.getModel().getActiveDetailModel(); + if (activeDetailModel instanceof HostHardwareGeneralModel) { + //Since the host hardware section has been merged into the general sub sub tab, it no longer has its + //own place. So we need to make sure it stays on the host-general sub tab, if not it will generate + //an invalid sub tab and go to the VM main tab. + String requestToken = getMainTabRequest().getNameToken() + WebAdminApplicationPlaces.SUB_TAB_PREFIX + + "general"; //$NON-NLS-1$ + return PlaceRequestFactory.get(requestToken); + } else { + return super.getSubTabRequest(); + } + } } -- To view, visit https://gerrit.ovirt.org/41610 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47f1ece04f1112ecbe00b6a4a9a4c0518d297ede Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <aw...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
