Sahina Bose has uploaded a new change for review. Change subject: webadmin: Hiding virt network fields in gluster mode ......................................................................
webadmin: Hiding virt network fields in gluster mode Change-Id: If9380697adc0c6e1d698e7aacc1f9b47be0d3851 Bug-Url: https://bugzilla.redhat.com/1207947 Signed-off-by: Sahina Bose <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/NetworkModel.java 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/tab/MainTabNetworkView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java 4 files changed, 58 insertions(+), 20 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/41480/1 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 75e338e..57811e0 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 @@ -14,6 +14,7 @@ import org.ovirt.engine.core.common.businessentities.network.HostNetworkQos; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.businessentities.network.VnicProfile; +import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.StringHelper; @@ -23,6 +24,7 @@ import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; +import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.uicommonweb.models.ConfirmationModel; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.HasValidatedTabs; @@ -154,7 +156,7 @@ setMtu(new EntityModel<Integer>()); EntityModel<Boolean> isVmNetwork = new EntityModel<Boolean>(); - isVmNetwork.setEntity(true); + isVmNetwork.setEntity(ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly)); setIsVmNetwork(isVmNetwork); isVmNetwork.getEntityChangedEvent().addListener(new IEventListener<EventArgs>() { @Override 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 8e5c8a9..5fa5081 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 @@ -5,6 +5,7 @@ import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.network.HostNetworkQos; +import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.view.popup.AbstractTabbedModelBoundPopupView; import org.ovirt.engine.ui.common.widget.Align; @@ -24,6 +25,7 @@ import org.ovirt.engine.ui.common.widget.table.column.AbstractCheckboxColumn; import org.ovirt.engine.ui.common.widget.table.column.AbstractTextColumn; import org.ovirt.engine.ui.common.widget.table.header.AbstractCheckboxHeader; +import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.TabName; import org.ovirt.engine.ui.uicommonweb.models.datacenters.NetworkClusterModel; @@ -214,6 +216,17 @@ initEntityModelCellTable(); localize(); addStyles(); + setVisibilities(); + } + + private void setVisibilities() { + if (ApplicationModeHelper.getUiMode() == ApplicationMode.GlusterOnly) { + isVmNetworkEditor.setVisible(false); + externalProviderEditor.setVisible(false); + vlanTagging.setVisible(false); + exportEditor.setVisible(false); + profilesTab.setVisible(false); + } } protected void localize() { diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java index c270c66..f9c506b 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabNetworkView.java @@ -6,6 +6,7 @@ import java.util.Map; import org.ovirt.engine.core.common.businessentities.network.NetworkView; +import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.core.searchbackend.NetworkConditionFieldAutoCompleter; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.uicommon.model.MainModelProvider; @@ -13,6 +14,7 @@ import org.ovirt.engine.ui.common.widget.table.column.AbstractSafeHtmlColumn; import org.ovirt.engine.ui.common.widget.table.column.AbstractTextColumn; import org.ovirt.engine.ui.uicommonweb.UICommand; +import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.ApplicationResources; @@ -72,15 +74,17 @@ SafeHtmlUtils.fromSafeConstant(constants.commentLabel()), "75px"); //$NON-NLS-1$ - AbstractTextColumn<NetworkView> dcColumn = new AbstractTextColumn<NetworkView>() { - @Override - public String getValue(NetworkView object) { - return object.getDataCenterName(); - } - }; - dcColumn.makeSortable(NetworkConditionFieldAutoCompleter.DATA_CENTER); + if (ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly) { + AbstractTextColumn<NetworkView> dcColumn = new AbstractTextColumn<NetworkView>() { + @Override + public String getValue(NetworkView object) { + return object.getDataCenterName(); + } + }; + dcColumn.makeSortable(NetworkConditionFieldAutoCompleter.DATA_CENTER); - getTable().addColumn(dcColumn, constants.dcNetwork(), "200px"); //$NON-NLS-1$ + getTable().addColumn(dcColumn, constants.dcNetwork(), "200px"); //$NON-NLS-1$ + } AbstractTextColumn<NetworkView> descriptionColumn = new AbstractTextColumn<NetworkView>() { @Override @@ -122,14 +126,16 @@ getTable().addColumn(roleColumn, constants.roleNetwork(), "60px"); //$NON-NLS-1$ - AbstractTextColumn<NetworkView> vlanColumn = new AbstractTextColumn<NetworkView>() { - @Override - public String getValue(NetworkView object) { - return object.getVlanId() == null ? "-" : object.getVlanId().toString(); //$NON-NLS-1$ - } - }; - vlanColumn.makeSortable(NetworkConditionFieldAutoCompleter.VLAN_ID); - getTable().addColumn(vlanColumn, constants.vlanNetwork(), "60px"); //$NON-NLS-1$ + if (ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly) { + AbstractTextColumn<NetworkView> vlanColumn = new AbstractTextColumn<NetworkView>() { + @Override + public String getValue(NetworkView object) { + return object.getVlanId() == null ? "-" : object.getVlanId().toString(); //$NON-NLS-1$ + } + }; + vlanColumn.makeSortable(NetworkConditionFieldAutoCompleter.VLAN_ID); + getTable().addColumn(vlanColumn, constants.vlanNetwork(), "60px"); //$NON-NLS-1$ + } AbstractTextColumn<NetworkView> labelColumn = new AbstractTextColumn<NetworkView>() { @Override @@ -147,7 +153,10 @@ } }; providerColumn.makeSortable(NetworkConditionFieldAutoCompleter.PROVIDER_NAME); - getTable().addColumn(providerColumn, constants.providerNetwork(), "200px"); //$NON-NLS-1$ + if (ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly) { + getTable().addColumn(providerColumn, constants.providerNetwork(), "200px"); //$NON-NLS-1$ + } + getTable().addActionButton(new WebAdminButtonDefinition<NetworkView>(constants.newNetwork()) { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java index 6f338a0..6900e1c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/network/SubTabNetworkGeneralView.java @@ -3,6 +3,7 @@ import javax.inject.Inject; import org.ovirt.engine.core.common.businessentities.network.NetworkView; +import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.idhandler.WithElementId; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; @@ -14,6 +15,7 @@ import org.ovirt.engine.ui.common.widget.label.GuidLabel; import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; import org.ovirt.engine.ui.common.widget.renderer.EmptyValueRenderer; +import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkGeneralModel; import org.ovirt.engine.ui.uicommonweb.models.networks.NetworkListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; @@ -80,8 +82,20 @@ formBuilder.addFormItem(new FormItem(constants.idNetwork(), id, 1, 0)); formBuilder.addFormItem(new FormItem(constants.descriptionNetwork(), description, 2, 0)); - formBuilder.addFormItem(new FormItem(constants.vmNetwork(), vmNetwork, 0, 1)); - formBuilder.addFormItem(new FormItem(constants.vlanNetwork(), vlan, 1, 1)); + formBuilder.addFormItem(new FormItem(constants.vmNetwork(), vmNetwork, 0, 1) { + @Override + public boolean getIsAvailable() { + return ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly); + } + }); + + formBuilder.addFormItem(new FormItem(constants.vlanNetwork(), vlan, 1, 1) { + @Override + public boolean getIsAvailable() { + return ApplicationModeHelper.isModeSupported(ApplicationMode.VirtOnly); + } + }); + formBuilder.addFormItem(new FormItem(constants.mtuNetwork(), mtu, 2, 1) { @Override public boolean getIsAvailable() { -- To view, visit https://gerrit.ovirt.org/41480 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9380697adc0c6e1d698e7aacc1f9b47be0d3851 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sahina Bose <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
