Alona Kaplan has uploaded a new change for review. Change subject: webadmin: adding note when removing network with provider. ......................................................................
webadmin: adding note when removing network with provider. Change-Id: Ib9cf462e188cdb2635abd10d8a98254aa35cd2dc Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/16047/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java index 2099689..187683a 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/RemoveConfirmationPopupView.java @@ -144,6 +144,7 @@ } }); + setNote(object.getNote()); // Bind "Note" object.getPropertyChangedEvent().addListener(new IEventListener() { @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java index 4271fbd..555fb98 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java @@ -26,6 +26,7 @@ setMessage(ConstantsManager.getInstance().getConstants().logicalNetworksMsg()); ArrayList<String> list = new ArrayList<String>(); + boolean hasNetworkWithProvider = false; for (Object a : sourceListModel.getSelectedItems()) { if (a instanceof NetworkView) { @@ -43,6 +44,10 @@ netView.getDescription())); } + if (netView.getProviderName() != null) { + hasNetworkWithProvider = true; + } + } else if (a instanceof Network) { Network network = (Network) a; if (network.getDescription() == null || "".equals(network.getDescription().trim())) { //$NON-NLS-1$ @@ -51,6 +56,10 @@ list.add(StringFormat.format("%1$s (%2$s)", network.getName(), network.getDescription())); //$NON-NLS-1$ } } + + if (hasNetworkWithProvider) { + setNote("Note: this will only remove the network from the system. It will remain in the external provider."); //$NON-NLS-1$ + } } setItems(list); -- To view, visit http://gerrit.ovirt.org/16047 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9cf462e188cdb2635abd10d8a98254aa35cd2dc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alona Kaplan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
