Alona Kaplan has uploaded a new change for review. Change subject: webadmin: adding 'enable host maintenance reason' to cluster popup ......................................................................
webadmin: adding 'enable host maintenance reason' to cluster popup It will indicate whether a popup for setting the reason should be displayed when moving the host to maintenance. Change-Id: I47e3ca6299f2f5df33b7eeaf5a2daaa9797a1894 Signed-off-by: Alona Kaplan <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml 6 files changed, 27 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/38299/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java index c7a431b..a1182aa 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java @@ -370,6 +370,7 @@ clusterModel.getEnableTrustedService().setEntity(cluster.supportsTrustedService()); clusterModel.getEnableHaReservation().setEntity(cluster.supportsHaReservation()); clusterModel.getEnableOptionalReason().setEntity(cluster.isOptionalReasonRequired()); + clusterModel.getEnableHostMaintenanceReason().setEntity(cluster.isVdsMaintenanceReasonRequired()); setWindow(clusterModel); clusterModel.setTitle(ConstantsManager.getInstance().getConstants().editClusterTitle()); clusterModel.setHelpTag(HelpTag.edit_cluster); @@ -690,6 +691,7 @@ cluster.setTrustedService(model.getEnableTrustedService().getEntity()); cluster.setHaReservation(model.getEnableHaReservation().getEntity()); cluster.setOptionalReasonRequired(model.getEnableOptionalReason().getEntity()); + cluster.setVdsMaintenanceReasonRequired(model.getEnableHostMaintenanceReason().getEntity()); cluster.setClusterPolicyId(model.getClusterPolicy().getSelectedItem().getId()); cluster.setClusterPolicyProperties(KeyValueModel.convertProperties(model.getCustomPropertySheet().serialize())); if (model.getOptimizeForSpeed().getEntity()) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java index 79af157..e89da13 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java @@ -702,6 +702,16 @@ this.enableOptionalReason = value; } + private EntityModel<Boolean> enableHostMaintenanceReason; + + public EntityModel<Boolean> getEnableHostMaintenanceReason() { + return enableHostMaintenanceReason; + } + + public void setEnableHostMaintenanceReason(EntityModel<Boolean> value) { + this.enableHostMaintenanceReason = value; + } + private EntityModel<Boolean> privateEnableTrustedService; private EntityModel<Boolean> privateEnableHaReservation; @@ -849,6 +859,7 @@ setEnableTrustedService(new EntityModel<Boolean>(false)); setEnableHaReservation(new EntityModel<Boolean>(false)); setEnableOptionalReason(new EntityModel<Boolean>(false)); + setEnableHostMaintenanceReason(new EntityModel<Boolean>(false)); setAllowClusterWithVirtGlusterEnabled(true); AsyncDataProvider.getInstance().getAllowClusterWithVirtGlusterEnabled(new AsyncQuery(this, new INewAsyncCallback() { @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java index 44d08e8..61e3532 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java @@ -1339,6 +1339,7 @@ cluster.setVirtService(model.getEnableOvirtService().getEntity()); cluster.setGlusterService(model.getEnableGlusterService().getEntity()); cluster.setOptionalReasonRequired(model.getEnableOptionalReason().getEntity()); + cluster.setVdsMaintenanceReasonRequired(model.getEnableHostMaintenanceReason().getEntity()); if (model.getClusterPolicy().getSelectedItem() != null) { ClusterPolicy selectedPolicy = model.getClusterPolicy().getSelectedItem(); cluster.setClusterPolicyId(selectedPolicy.getId()); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java index c72bec5..ded2317 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java @@ -190,6 +190,9 @@ @DefaultStringValue("Enable to set VM maintenance reason") String clusterPolicyEnableReasonLabel(); + @DefaultStringValue("Enable to set Host maintenance reason") + String clusterPolicyEnableHostMaintenanceReasonLabel(); + @DefaultStringValue("KSM control") String ksmLabelTitle(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java index c4fa5e5..be3e6a3 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java @@ -178,6 +178,11 @@ @WithElementId EntityModelCheckBoxEditor enableOptionalReasonEditor; + @UiField(provided = true) + @Path(value = "enableHostMaintenanceReason.entity") + @WithElementId + EntityModelCheckBoxEditor enableHostMaintenanceReasonEditor; + @UiField @Ignore Label rngLabel; @@ -439,6 +444,7 @@ enableTrustedServiceEditor.setContentWidgetContainerStyleName(style.fullWidth()); enableHaReservationEditor.setContentWidgetContainerStyleName(style.fullWidth()); enableOptionalReasonEditor.setContentWidgetContainerStyleName(style.fullWidth()); + enableHostMaintenanceReasonEditor.setContentWidgetContainerStyleName(style.fullWidth()); } private void localize(ApplicationConstants constants) { @@ -486,6 +492,7 @@ enableTrustedServiceEditor.setLabel(constants.clusterPolicyEnableTrustedServiceLabel()); enableHaReservationEditor.setLabel(constants.clusterPolicyEnableHaReservationLabel()); enableOptionalReasonEditor.setLabel(constants.clusterPolicyEnableReasonLabel()); + enableHostMaintenanceReasonEditor.setLabel(constants.clusterPolicyEnableHostMaintenanceReasonLabel()); clusterPolicyEditor.setLabel(constants.clusterPolicySelectPolicyLabel()); enableKsm.setLabel(constants.enableKsmLabel()); @@ -590,6 +597,8 @@ enableOptionalReasonEditor = new EntityModelCheckBoxEditor(Align.RIGHT); + enableHostMaintenanceReasonEditor = new EntityModelCheckBoxEditor(Align.RIGHT); + enableKsm = new EntityModelCheckBoxEditor(Align.RIGHT); enableKsm.getContentWidgetContainer().setWidth("350px"); //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml index ac87edf..60a1f39 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.ui.xml @@ -189,6 +189,7 @@ <ge:StringEntityModelPasswordBoxEditor ui:field="glusterHostPasswordEditor" /> <g:Label ui:field="messageLabel" addStyleNames="{style.messageLabel}" /> <ge:EntityModelCheckBoxEditor ui:field="enableOptionalReasonEditor" /> + <ge:EntityModelCheckBoxEditor ui:field="enableHostMaintenanceReasonEditor" /> <g:FlowPanel> <g:Label ui:field="rngLabel" addStyleNames="{style.panelTitle}" /> <ge:EntityModelCheckBoxEditor ui:field="rngRandomSourceRequired" /> -- To view, visit https://gerrit.ovirt.org/38299 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47e3ca6299f2f5df33b7eeaf5a2daaa9797a1894 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
