Moti Asayag has uploaded a new change for review. Change subject: webadmin: Print network description on Remove dialog ......................................................................
webadmin: Print network description on Remove dialog The patch modifies the 'null' value printed for each network within the list of removed networks with the network name and its description (if description was defined for the network). Change-Id: Ic7842e5267b084470fc75e8f12bc4666b2f75605 Signed-off-by: Moti Asayag <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/RemoveNetworksModel.java 1 file changed, 6 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/91/9791/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 6b298dc..914347c 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 @@ -7,6 +7,7 @@ import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.Network; import org.ovirt.engine.core.common.businessentities.NetworkView; +import org.ovirt.engine.core.compat.StringFormat; import org.ovirt.engine.core.compat.StringHelper; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.uicommonweb.UICommand; @@ -45,7 +46,11 @@ } else if (a instanceof Network) { Network network = (Network) a; - list.add(network.getdescription()); + if (network.getdescription() == null || "".equals(network.getdescription().trim())) { + list.add(network.getName()); + } else { + list.add(StringFormat.format("%1$s (%2$s)", network.getName(), network.getdescription())); //$NON-NLS-1$ + } } } setItems(list); -- To view, visit http://gerrit.ovirt.org/9791 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic7842e5267b084470fc75e8f12bc4666b2f75605 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Moti Asayag <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
