anmolbabu has uploaded a new change for review. Change subject: webadmin : hide virt-related fields in cluster add network ......................................................................
webadmin : hide virt-related fields in cluster add network The Add Network dialog for a cluster, contains some fields and references that are not relevant to RHS. For e.g. - 1.The dialog shows the following sentence on top - The Network will be added to the Data Center Default as well. 2.The reference to Data Center needs to be removed as it is not present anywhere else in the UI. 3.There is a section called Network Parameters, which has check boxes for 'VM Network'. 4.A sub-tab called Profiles is seen in the dialog, which has to do with vNIC Profiles. Change-Id: I3f7e705fb7e44980ae4eee68e656838e100f18b8 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1015020 Signed-off-by: Anmol Babu <anb...@redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/AbstractNetworkPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java 2 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/21744/1 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 1d92701..980fb6d 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 @@ -4,6 +4,7 @@ import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.StoragePool; +import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.Version; import org.ovirt.engine.ui.common.idhandler.WithElementId; @@ -21,6 +22,7 @@ import org.ovirt.engine.ui.common.widget.table.column.CheckboxColumn; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.common.widget.table.header.CheckboxHeader; +import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.datacenters.NetworkClusterModel; @@ -182,6 +184,9 @@ } }); isVmNetworkEditor = new EntityModelCheckBoxEditor(Align.RIGHT); + if (ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly)) { + isVmNetworkEditor.setVisible(false); + } vlanTagging = new EntityModelCheckBoxEditor(Align.RIGHT); hasMtuEditor = new EntityModelCheckBoxEditor(Align.RIGHT); this.clustersTable = new EntityModelCellTable<ListModel>(SelectionMode.NONE, true); @@ -371,7 +376,7 @@ @Override public void toggleProfilesVisibility(boolean visible) { - profilesTab.setVisible(visible); + profilesTab.setVisible((visible) && (ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly))); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java index d6bd4f6..4d99194 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/NewClusterNetworkPopupView.java @@ -1,5 +1,7 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup.cluster; +import org.ovirt.engine.core.common.mode.ApplicationMode; +import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.ApplicationMessages; import org.ovirt.engine.ui.webadmin.ApplicationResources; @@ -26,7 +28,9 @@ @Override public void setDataCenterName(String name) { - messageLabel.setText(messages.theNetworkWillBeAddedToTheDataCenterAsWell(name)); + if (ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly)) { + messageLabel.setText(messages.theNetworkWillBeAddedToTheDataCenterAsWell(name)); + } } -- To view, visit http://gerrit.ovirt.org/21744 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3f7e705fb7e44980ae4eee68e656838e100f18b8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: anmolbabu <anb...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
