Mike Kolesnik has uploaded a new change for review. Change subject: webadmin: Add "remove from provider" checkbox ......................................................................
webadmin: Add "remove from provider" checkbox Added checkbox allowing removal of an external network from the provider as well when removing the network from oVirt. Change-Id: Ic39d7d2424159dd354aae3610d86b78fb8ab309e Signed-off-by: Mike Kolesnik <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java 2 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/22615/1 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 288deb8..bc3b438 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 @@ -53,7 +53,9 @@ } if (network.isExternal()) { - setNote(ConstantsManager.getInstance().getConstants().removeProvidedNetworksNote()); + getForce().setIsAvailable(true); + getForce().setEntity(true); + setForceLabel(ConstantsManager.getInstance().getConstants().removeNetworkFromProvider()); } } setItems(list); @@ -76,7 +78,7 @@ { Network network = (Network) a; if (network.isExternal()) { - pb.add(new RemoveNetworkParameters(network.getId(), getForce().getIsSelected())); + pb.add(new RemoveNetworkParameters(network.getId(), (Boolean) getForce().getEntity())); } else { pb.add(new RemoveNetworkParameters(network.getId())); } diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java index 4a5dd7b..d11bbda 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIConstants.java @@ -1966,8 +1966,8 @@ @DefaultStringValue("The given mappings are of an invalid format.") String interfaceMappingsInvalid(); - @DefaultStringValue("Note: this will only remove the listed networks from the system.\nThey will remain intact on any external providers.") - String removeProvidedNetworksNote(); + @DefaultStringValue("Remove external network(s) from the provider(s) as well.") + String removeNetworkFromProvider(); // Gluster Hook @DefaultStringValue("Please select a resolve action to continue") -- To view, visit http://gerrit.ovirt.org/22615 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic39d7d2424159dd354aae3610d86b78fb8ab309e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
