Lior Vernia has uploaded a new change for review. Change subject: webadmin: Pass validation when QoS widget is hidden ......................................................................
webadmin: Pass validation when QoS widget is hidden In lower cluster compatibility versions the QoS widget is hidden when editing a network attached to a host, in this case it should be considered valid for the dialog to be approved. Change-Id: I8d9833d3e66aacb60539b4f0f9e550d194f0ef0a Bug-Url: https://bugzilla.redhat.com/1054314 Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/BaseNetworkQosModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java 2 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/23364/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/BaseNetworkQosModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/BaseNetworkQosModel.java index 82276df..4d247e3 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/BaseNetworkQosModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/BaseNetworkQosModel.java @@ -75,6 +75,10 @@ } public boolean validate() { + if (!getIsAvailable()) { + return true; + } + getInbound().validate(); getOutbound().validate(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java index 897cc90..d005081 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostSetupNetworksModel.java @@ -422,8 +422,10 @@ entity.setGateway((String) networkDialogModel.getGateway().getEntity()); } - entity.setQosOverridden(networkDialogModel.getQosOverridden().getEntity()); - entity.setQos(networkDialogModel.getQosModel().flush()); + if (networkDialogModel.getQosModel().getIsAvailable()) { + entity.setQosOverridden(networkDialogModel.getQosOverridden().getEntity()); + entity.setQos(networkDialogModel.getQosModel().flush()); + } if ((Boolean) networkDialogModel.getIsToSync().getEntity()) { networksToSync.add(logicalNetwork.getName()); -- To view, visit http://gerrit.ovirt.org/23364 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8d9833d3e66aacb60539b4f0f9e550d194f0ef0a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
