Lior Vernia has uploaded a new change for review. Change subject: webadmin: Open correct bond dialog from Network/Hosts subtab ......................................................................
webadmin: Open correct bond dialog from Network/Hosts subtab Apparently the old (pre 3.1) bond dialog would open, when the newer one should. Also removed code that checked if the open dialog is the Setup Networks dialog, which as far as I know is the only possible case in this subtab (whereas in Host/Networks it could have been the pre-3.1 Host Interfaces dialog). Change-Id: Ia5cc40bda079513bfce7b08d6f279aaebe554817 Bug-Url: https://bugzilla.redhat.com/1012821 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/NetworkModule.java 1 file changed, 9 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/19896/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/NetworkModule.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/NetworkModule.java index 8e4c51b..8996c77 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/NetworkModule.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/gin/uicommon/NetworkModule.java @@ -28,7 +28,6 @@ import org.ovirt.engine.ui.uicommonweb.models.hosts.HostBondInterfaceModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.HostInterfaceModel; import org.ovirt.engine.ui.uicommonweb.models.hosts.HostManagementNetworkModel; -import org.ovirt.engine.ui.uicommonweb.models.hosts.HostSetupNetworksModel; import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkClusterListModel; import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkGeneralModel; import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkHostListModel; @@ -40,8 +39,8 @@ import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.cluster.ClusterManageNetworkPopupPresenterWidget; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.datacenter.EditNetworkPopupPresenterWidget; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.datacenter.NewNetworkPopupPresenterWidget; -import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.host.HostBondPopupPresenterWidget; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.host.HostSetupNetworksPopupPresenterWidget; +import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.host.SetupNetworksBondPopupPresenterWidget; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.host.SetupNetworksInterfacePopupPresenterWidget; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.host.SetupNetworksManagementPopupPresenterWidget; import org.ovirt.engine.ui.webadmin.section.main.presenter.popup.profile.VnicProfilePopupPresenterWidget; @@ -172,9 +171,9 @@ @Singleton public SearchableDetailModelProvider<PairQueryable<VdsNetworkInterface, VDS>, NetworkListModel, NetworkHostListModel> getNetworkHostListProvider(EventBus eventBus, Provider<DefaultConfirmationPopupPresenterWidget> defaultConfirmPopupProvider, + final Provider<SetupNetworksBondPopupPresenterWidget> setupNetworksBondPopupProvider, final Provider<SetupNetworksInterfacePopupPresenterWidget> setupNetworksInterfacePopupProvider, final Provider<SetupNetworksManagementPopupPresenterWidget> setupNetworksManagementPopupProvider, - final Provider<HostBondPopupPresenterWidget> hostBondPopupProvider, final Provider<HostSetupNetworksPopupPresenterWidget> hostSetupNetworksPopupProvider) { return new SearchableDetailTabModelProvider<PairQueryable<VdsNetworkInterface, VDS>, NetworkListModel, NetworkHostListModel>( eventBus, defaultConfirmPopupProvider, @@ -184,17 +183,14 @@ public AbstractModelBoundPopupPresenterWidget<? extends Model, ?> getModelPopup(NetworkHostListModel source, UICommand lastExecutedCommand, Model windowModel) { - if (windowModel instanceof HostBondInterfaceModel) { - return hostBondPopupProvider.get(); - } - if (source.getWindow() instanceof HostSetupNetworksModel) { - // Resolve by dialog model - if (windowModel instanceof HostInterfaceModel) { - return setupNetworksInterfacePopupProvider.get(); - } else if (windowModel instanceof HostManagementNetworkModel) { - return setupNetworksManagementPopupProvider.get(); - } + // Resolve by dialog model + if (windowModel instanceof HostBondInterfaceModel) { + return setupNetworksBondPopupProvider.get(); + } else if (windowModel instanceof HostInterfaceModel) { + return setupNetworksInterfacePopupProvider.get(); + } else if (windowModel instanceof HostManagementNetworkModel) { + return setupNetworksManagementPopupProvider.get(); } // Resolve by last executed command -- To view, visit http://gerrit.ovirt.org/19896 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia5cc40bda079513bfce7b08d6f279aaebe554817 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
