Kanagaraj M has uploaded a new change for review. Change subject: webadmin: hiding virt related fields in Gluster mode ......................................................................
webadmin: hiding virt related fields in Gluster mode The following ui fields will be hidden when the Application mode is Gluster only. - CPU colum in Cluster main tab - Data Center name in Cluster general tab - Console tab in Host popup - SPM Priority in Host general tab Change-Id: I5352cf678161905d46281331168df4fb7b97b622 Signed-off-by: Kanagaraj M <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java 4 files changed, 16 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/13430/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java index 810a6bb..ff1815c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java @@ -395,6 +395,7 @@ { spmTab.setVisible(false); powerManagementTab.setVisible(false); + consoleTab.setVisible(false); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java index 3e12c14..45ca065 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabClusterView.java @@ -3,12 +3,14 @@ import java.util.List; import org.ovirt.engine.core.common.businessentities.VDSGroup; +import org.ovirt.engine.core.common.mode.ApplicationMode; import org.ovirt.engine.ui.common.idhandler.ElementIdHandler; import org.ovirt.engine.ui.common.uicommon.model.MainModelProvider; import org.ovirt.engine.ui.common.widget.action.ActionButtonDefinition; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.uicommonweb.ReportInit; import org.ovirt.engine.ui.uicommonweb.UICommand; +import org.ovirt.engine.ui.uicommonweb.models.ApplicationModeHelper; import org.ovirt.engine.ui.uicommonweb.models.clusters.ClusterListModel; import org.ovirt.engine.ui.webadmin.ApplicationConstants; import org.ovirt.engine.ui.webadmin.ApplicationResources; @@ -72,13 +74,15 @@ }; getTable().addColumn(descColumn, constants.descriptionCluster(), "300px"); //$NON-NLS-1$ - TextColumnWithTooltip<VDSGroup> cpuNameColumn = new TextColumnWithTooltip<VDSGroup>() { - @Override - public String getValue(VDSGroup object) { - return object.getcpu_name(); - } - }; - getTable().addColumn(cpuNameColumn, constants.cpuNameCluster(), "150px"); //$NON-NLS-1$ + if (ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly) { + TextColumnWithTooltip<VDSGroup> cpuNameColumn = new TextColumnWithTooltip<VDSGroup>() { + @Override + public String getValue(VDSGroup object) { + return object.getcpu_name(); + } + }; + getTable().addColumn(cpuNameColumn, constants.cpuNameCluster(), "150px"); //$NON-NLS-1$ + } getTable().addActionButton(new WebAdminButtonDefinition<VDSGroup>(constants.newCluster()) { @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java index c55c4c4..58d382c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java @@ -68,7 +68,9 @@ formBuilder.setColumnsWidth("180px", "180px", "180px"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ formBuilder.addFormItem(new FormItem(constants.nameCluster(), name, 0, 0)); formBuilder.addFormItem(new FormItem(constants.descriptionCluster(), description, 1, 0)); - formBuilder.addFormItem(new FormItem(constants.dcCluster(), dataCenterName, 2, 0)); + if (ApplicationModeHelper.getUiMode() != ApplicationMode.GlusterOnly) { + formBuilder.addFormItem(new FormItem(constants.dcCluster(), dataCenterName, 2, 0)); + } formBuilder.addFormItem(new FormItem(constants.compatibilityVersionCluster(), compatibilityVersion, 3, 0)); // Show the cluster type only if the application is running in both the modes diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java index 5a09aef..cd29884 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/host/SubTabHostGeneralView.java @@ -173,7 +173,7 @@ FormItem formItem = iterator.next(); Widget widget = formItem.getValue(); if (widget == kvmVersion || widget == spiceVersion || widget == iScsiInitiatorName || widget == activeVms - || widget == libvirtVersion || widget == maxSchedulingMemory) + || widget == libvirtVersion || widget == maxSchedulingMemory || widget == spmPriority) { iterator.remove(); } -- To view, visit http://gerrit.ovirt.org/13430 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5352cf678161905d46281331168df4fb7b97b622 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
