Lior Vernia has uploaded a new change for review. Change subject: webadmin: Fixed Add/Edit Network logic ......................................................................
webadmin: Fixed Add/Edit Network logic The implemented logic was only right when adding a new network, fixed it a little. Also, the edit window used to be shorter than the add window, but that didn't look good anymore. Change-Id: I192b0213a8b9207b69364677ddb6e59874240b60 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/EditNetworkPopupView.java 5 files changed, 40 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/16956/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java index c251284..e761029 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/EditNetworkModel.java @@ -32,6 +32,9 @@ initMtu(); initIsVm(); getExport().setEntity(getNetwork().isExternal()); + getExport().setIsChangable(false); + getExternalProviders().setIsChangable(false); + getNetworkLabel().setIsChangable(false); } @Override @@ -55,6 +58,17 @@ } @Override + protected void onExportChanged() { + if ((Boolean) getExport().getEntity()) { + getHasVLanTag().setIsChangable(false); + getVLanTag().setIsChangable(false); + getIsVmNetwork().setIsChangable(false); + getHasMtu().setIsChangable(false); + getMtu().setIsChangable(false); + } + } + + @Override public void executeSave() { Frontend.RunAction(VdcActionType.UpdateNetwork, new AddNetworkStoragePoolParameters(getSelectedDc().getId(), getNetwork()), diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java index ea580da..fb8fe9b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java @@ -343,6 +343,7 @@ setMTUOverrideSupported(isMTUOverrideSupported); + onExportChanged(); } protected void addCommands() { @@ -433,19 +434,7 @@ protected abstract void initIsVm(); - private void onExportChanged() { - boolean externalNetwork = (Boolean) getExport().getEntity(); - getExternalProviders().setIsChangable(externalNetwork); - getNetworkLabel().setIsChangable(externalNetwork); - getHasVLanTag().setIsChangable(!externalNetwork); - getIsVmNetwork().setIsChangable(!externalNetwork); - getHasMtu().setIsChangable(!externalNetwork); - if (externalNetwork) { - getHasVLanTag().setEntity(false); - getIsVmNetwork().setEntity(true); - getHasMtu().setEntity(false); - } - } + protected abstract void onExportChanged(); private void updateVlanTagChangeability() { getVLanTag().setIsChangable((Boolean) getHasVLanTag().getEntity() && !((Boolean) getExport().getEntity())); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java index b0aefc2..48e2faa 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NewNetworkModel.java @@ -96,6 +96,21 @@ } @Override + protected void onExportChanged() { + boolean externalNetwork = (Boolean) getExport().getEntity(); + getExternalProviders().setIsChangable(externalNetwork); + getNetworkLabel().setIsChangable(externalNetwork); + getHasVLanTag().setIsChangable(!externalNetwork); + getIsVmNetwork().setIsChangable(!externalNetwork); + getHasMtu().setIsChangable(!externalNetwork); + if (externalNetwork) { + getHasVLanTag().setEntity(false); + getIsVmNetwork().setEntity(true); + getHasMtu().setEntity(false); + } + } + + @Override protected void executeSave() { IFrontendActionAsyncCallback addNetworkCallback = new IFrontendActionAsyncCallback() { @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java index aadff3e..be0b128 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java @@ -121,7 +121,7 @@ networkModel.getDataCenters().setItems(Arrays.asList(dc)); networkModel.getDataCenters().setSelectedItem(dc); networkModel.getDataCenters().setIsChangable(false); - initExternalNetworksList(networkModel); + initExternalProvidersList(networkModel); return; } @@ -141,12 +141,12 @@ } else { networkModel.getDataCenters().setSelectedItem(Linq.firstOrDefault(dataCenters)); } - initExternalNetworksList(networkModel); + initExternalProvidersList(networkModel); } })); } - private void initExternalNetworksList(final NetworkModel networkModel) { + private void initExternalProvidersList(final NetworkModel networkModel) { if (networkModel instanceof NewNetworkModel) { AsyncQuery getProvidersQuery = new AsyncQuery(); getProvidersQuery.asyncCallback = new INewAsyncCallback() { @@ -161,9 +161,12 @@ }; AsyncDataProvider.GetAllProviders(getProvidersQuery); } else { - Provider provider = new Provider(); - provider.setName(((NetworkView) getSelectedItem()).getProviderName()); - networkModel.getExternalProviders().setSelectedItem(provider); + NetworkView network = (NetworkView) getSelectedItem(); + if (network.isExternal()) { + Provider provider = new Provider(); + provider.setName(network.getProviderName()); + networkModel.getExternalProviders().setSelectedItem(provider); + } networkModel.stopProgress(); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/EditNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/EditNetworkPopupView.java index c78d127..2597954 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/EditNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/datacenter/EditNetworkPopupView.java @@ -25,7 +25,6 @@ ApplicationConstants constants, ApplicationTemplates templates) { super(eventBus, resources, constants, templates); - mainPanel.setHeight("310px"); //$NON-NLS-1$ driver.initialize(this); } -- To view, visit http://gerrit.ovirt.org/16956 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I192b0213a8b9207b69364677ddb6e59874240b60 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
