Noam Slomianko has uploaded a new change for review. Change subject: webadmin: Make HA consistant in VM and template tabs ......................................................................
webadmin: Make HA consistant in VM and template tabs Problems: * Inconsistent display of the high availability value between vm and template tabs and inside the template tab Solution: * Change the display component to BooleanLabel and check the hasHighlyAvailable flag Change-Id: Ia71c1bf7af6658f880c95b566b50655a6fe0c5c5 Signed-off-by: Noam Slomianko <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java 2 files changed, 12 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/8164/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java index 60c21ba..9892662 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/template/TemplateGeneralModelForm.java @@ -3,6 +3,7 @@ import org.ovirt.engine.ui.common.CommonApplicationConstants; import org.ovirt.engine.ui.common.uicommon.model.ModelProvider; import org.ovirt.engine.ui.common.widget.form.FormItem; +import org.ovirt.engine.ui.common.widget.label.BooleanLabel; import org.ovirt.engine.ui.common.widget.label.TextBoxLabel; import org.ovirt.engine.ui.common.widget.uicommon.AbstractModelBoundFormWidget; import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateGeneralModel; @@ -30,16 +31,17 @@ TextBoxLabel timeZone = new TextBoxLabel(); TextBoxLabel quotaName = new TextBoxLabel(); + BooleanLabel isHighlyAvailable; + @Ignore TextBoxLabel monitorCount = new TextBoxLabel(); - @Ignore - TextBoxLabel isHighlyAvailable = new TextBoxLabel(); @Ignore TextBoxLabel isStateless = new TextBoxLabel(); public TemplateGeneralModelForm(ModelProvider<TemplateGeneralModel> modelProvider, CommonApplicationConstants constants) { super(modelProvider, 3, 6); Driver.driver.initialize(this); + isHighlyAvailable = new BooleanLabel(constants.yes(), constants.no()); // Build a form using the FormBuilder formBuilder.setColumnsWidth("120px", "240px", "160px"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ @@ -52,7 +54,12 @@ formBuilder.addFormItem(new FormItem(constants.definedMemTemplateGeneral(), definedMemory, 0, 1)); formBuilder.addFormItem(new FormItem(constants.numOfCpuCoresTemplateGeneral(), cpuInfo, 1, 1)); formBuilder.addFormItem(new FormItem(constants.numOfMonitorsTemplateGeneral(), monitorCount, 2, 1)); - formBuilder.addFormItem(new FormItem(constants.highlyAvailTemplateGeneral(), isHighlyAvailable, 3, 1)); + formBuilder.addFormItem(new FormItem(constants.highlyAvailTemplateGeneral(), isHighlyAvailable, 3, 1){ + @Override + public boolean isVisible() { + return getModel().getHasHighlyAvailable(); + } + }); formBuilder.addFormItem(new FormItem(constants.priorityTemplateGeneral(), priority, 4, 1)); formBuilder.addFormItem(new FormItem(constants.usbPolicyTemplateGeneral(), usbPolicy, 5, 1) { @Override @@ -90,7 +97,6 @@ // TODO required because of GWT#5864 monitorCount.setText(Integer.toString(getModel().getMonitorCount())); - isHighlyAvailable.setText(Boolean.toString(getModel().getIsHighlyAvailable())); isStateless.setText(Boolean.toString(getModel().getIsStateless())); } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java index 25e152f..3912e8e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateGeneralModel.java @@ -10,6 +10,7 @@ import org.ovirt.engine.core.common.businessentities.UsbPolicy; import org.ovirt.engine.core.common.businessentities.VmOsType; import org.ovirt.engine.core.common.businessentities.VmTemplate; +import org.ovirt.engine.core.common.businessentities.VmType; import org.ovirt.engine.core.compat.PropertyChangedEventArgs; import org.ovirt.engine.core.compat.StringFormat; import org.ovirt.engine.core.compat.StringHelper; @@ -455,6 +456,7 @@ && !template.getQuotaEnforcementType().equals(QuotaEnforcementTypeEnum.DISABLED)); setHostCluster(template.getvds_group_name()); setDefinedMemory(template.getmem_size_mb() + " MB"); //$NON-NLS-1$ + setHasHighlyAvailable(template.getvm_type() == VmType.Server); setIsHighlyAvailable(template.getauto_startup()); setPriority(PriorityToString(template.getpriority())); setMonitorCount(template.getnum_of_monitors()); -- To view, visit http://gerrit.ovirt.org/8164 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia71c1bf7af6658f880c95b566b50655a6fe0c5c5 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Noam Slomianko <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
