Alona Kaplan has uploaded a new change for review. Change subject: webadmin: Edit net- error lable is visible even if it shouldn't (#845274) ......................................................................
webadmin: Edit net- error lable is visible even if it shouldn't (#845274) https://bugzilla.redhat.com/845274 1. Rephrase to error msg on Edit Mgmt to- "Cannot edit Management Network when there are one or more Clusters in the Data Center" 2. If a network doesn't attached to any cluster. When opening the edit network dialog the error msg appears even it shouldn't. Change-Id: I09051257df435aea9f889eb7f794c109c4c05f27 Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/AbstractNetworkPopupPresenterWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java 6 files changed, 26 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/28/7128/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java index 24b5875..f10f127 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkListModel.java @@ -823,9 +823,15 @@ if (networkHasAttachedClusters) { model.getIsEnabled().setEntity(false); + }else{ + model.getIsEnabled().setEntity(true); + if (StringHelper.stringsEqual(network.getname(), ENGINE_NETWORK)){ + model.getName().setIsChangable(false); + } } model.setNetworkClusterList(getNetworkClusterList()); + if (StringHelper.stringsEqual(network.getname(), ENGINE_NETWORK) && networkClusterList.size() > 0) { UICommand tempVar = new UICommand("Cancel", this); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkModel.java index b586301..1e016c7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterNetworkModel.java @@ -17,8 +17,4 @@ privateIsNew = value; } - public DataCenterNetworkModel() - { - } - } 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 c8087fb..adeca04 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 @@ -209,8 +209,20 @@ setNetworkClusterList(new ListModel()); setOriginalClusters(new ArrayList<VDSGroup>()); - setIsEnabled(new EntityModel()); - getIsEnabled().setEntity(true); + setIsEnabled(new EntityModel() { + @Override + public void setEntity(Object value) { + super.setEntity(value); + getName().setIsChangable((Boolean) value); + getDescription().setIsChangable((Boolean) value); + getIsVmNetwork().setIsChangable((Boolean) value); + getHasVLanTag().setIsChangable((Boolean) value); + getVLanTag().setIsChangable((Boolean) value); + getHasMtu().setIsChangable((Boolean) value); + getMtu().setIsChangable((Boolean) value); + } + + }); } public boolean Validate() diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java index 3a81a63..3ff8dbf 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/Constants.java @@ -577,7 +577,7 @@ @DefaultStringValue("Logical Network(s)") String logicalNetworksMsg(); - @DefaultStringValue("Cannot edit Management Network") + @DefaultStringValue("Cannot edit Management Network when there are one or more Clusters in the Data Center") String cannotDetachManagementNetworkFromClustersMsg(); @DefaultStringValue("You are about to attach the network to all the selected clusters and to detach the network from all the unselected clusters.\n\nAre you sure you want to continue?") diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/AbstractNetworkPopupPresenterWidget.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/AbstractNetworkPopupPresenterWidget.java index b45466f..d584560 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/AbstractNetworkPopupPresenterWidget.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/popup/AbstractNetworkPopupPresenterWidget.java @@ -27,7 +27,7 @@ void setMessageLabel(String label); - void setInputFieldsEnabled(boolean enabled); + void postModelEnabled(boolean enabled); HasClickHandlers getApply(); @@ -103,7 +103,7 @@ public void eventRaised(Event ev, Object sender, EventArgs args) { EntityModel entity = (EntityModel) sender; boolean inputFieldsEnabled = (Boolean) entity.getEntity(); - getView().setInputFieldsEnabled(inputFieldsEnabled); + getView().postModelEnabled(inputFieldsEnabled); } }); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java index b57ff18..8692a31 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java @@ -150,15 +150,8 @@ } @Override - public void setInputFieldsEnabled(boolean enabled) { - nameEditor.setEnabled(enabled); - descriptionEditor.setEnabled(enabled); - isVmNetworkEditor.setEnabled(enabled); - vlanTagging.setEnabled(enabled); - vlanTag.setEnabled(enabled); - hasMtuEditor.setEnabled(enabled); - mtuEditor.setEnabled(enabled); - messageLabel.setVisible(!enabled); + public void postModelEnabled(boolean enabled) { + messageLabel.setVisible(!enabled); } @Override @@ -254,6 +247,7 @@ } public void updateVisibility() { + messageLabel.setVisible(false); } @Override -- To view, visit http://gerrit.ovirt.org/7128 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I09051257df435aea9f889eb7f794c109c4c05f27 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
