Tomer Saban has uploaded a new change for review. Change subject: webadmin: Added place holder for watchdog model. ......................................................................
webadmin: Added place holder for watchdog model. When adding new VM the watchdog model didn't have a place holder like the watchdog action did. So a place holder was added "<No Watchdog>" to comply with current UI design standards. watchdog model ListModelListBoxEditor class was changed to ListModelTypeAheadChangeableListBoxEditor inorder to add support for the new place holder. Change-Id: Ice4111935a0ec3bb29237660702e536adbc34d14 Bug-Url: https://bugzilla.redhat.com/1166047 Signed-off-by: Tomer Saban <tsa...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/ExistingInstanceTypeModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/InstanceTypeManager.java 10 files changed, 91 insertions(+), 59 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/88/36688/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index c2fbb07..b914981 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -670,8 +670,11 @@ @DefaultStringValue("Watchdog Action") String watchdogAction(); + @DefaultStringValue("<No Watchdog>") + String noWatchdogSelected(); + @DefaultStringValue("Watchdog Model") - String watchdogModel(); + String watchdogModelWithPlaceHolder(); @DefaultStringValue("Template Provisioning") String templateProvisVmPopup(); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java index 5e2c248..d75ac51 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java @@ -49,7 +49,7 @@ import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmType; import org.ovirt.engine.core.common.businessentities.VmWatchdogAction; -import org.ovirt.engine.core.common.businessentities.VmWatchdogType; + import org.ovirt.engine.core.common.businessentities.profiles.CpuProfile; import org.ovirt.engine.core.common.queries.ConfigurationValues; import org.ovirt.engine.core.compat.StringFormat; @@ -715,14 +715,14 @@ public FlowPanel watchdogPanel; @UiField(provided = true) - @Path(value = "watchdogModel.selectedItem") - @WithElementId("watchdogModel") - public ListModelListBoxEditor<VmWatchdogType> watchdogModelEditor; - - @UiField(provided = true) @Path(value = "watchdogAction.selectedItem") @WithElementId("watchdogAction") public ListModelListBoxEditor<VmWatchdogAction> watchdogActionEditor; + + @UiField(provided = true) + @Path(value = "watchdogModelWithPlaceHolderEditor.selectedItem") + @WithElementId("watchdogModelWithPlaceHolderEditor") + public ListModelTypeAheadChangeableListBoxEditor watchdogModelWithPlaceHolderEditor; // ==Resource Allocation Tab== @UiField @@ -890,13 +890,6 @@ // TODO: How to align right without creating the widget manually? hostCpuEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer()); isHighlyAvailableEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer()); - - watchdogModelEditor = new ListModelListBoxEditor<VmWatchdogType>(new NullSafeRenderer<VmWatchdogType>() { - @Override - protected String renderNullSafe(VmWatchdogType object) { - return EnumTranslator.getInstance().get(object); - } - }, new ModeSwitchingVisibilityRenderer()); watchdogActionEditor = new ListModelListBoxEditor<VmWatchdogAction>(new NullSafeRenderer<VmWatchdogAction>() { @Override @@ -1232,6 +1225,22 @@ new ModeSwitchingVisibilityRenderer(), constants.clusterDefaultOption()); + watchdogModelWithPlaceHolderEditor = new ListModelTypeAheadChangeableListBoxEditor( + new ListModelTypeAheadChangeableListBoxEditor.NullSafeSuggestBoxRenderer() { + + @Override + public String getDisplayStringNullSafe(String data) { + if (data == null || data.trim().isEmpty()) { + data = constants.noWatchdogSelected(); + } + + return typeAheadNameTemplateNullSafe(data); + } + }, + false, + new ModeSwitchingVisibilityRenderer(), + constants.noWatchdogSelected()); + customCpu = new ListModelTypeAheadChangeableListBoxEditor( new ListModelTypeAheadChangeableListBoxEditor.NullSafeSuggestBoxRenderer() { @@ -1463,12 +1472,13 @@ numaTuneMode.setLabel(constants.numaTunaModeLabel()); numaNodeCount.setLabel(constants.numaNodeCountLabel()); numaSupportButton.setLabel(constants.numaSupportButtonLabel()); + // High Availability Tab isHighlyAvailableEditor.setLabel(constants.highlyAvailableVmPopup()); // watchdog watchdogActionEditor.setLabel(constants.watchdogAction()); - watchdogModelEditor.setLabel(constants.watchdogModel()); + watchdogModelWithPlaceHolderEditor.setLabel(constants.watchdogModelWithPlaceHolder()); // Resource Allocation Tab cpuProfilesEditor.setLabel(constants.cpuProfileLabel()); @@ -1954,13 +1964,14 @@ numaNodeCount.setTabIndex(nextTabIndex++); numaTuneMode.setTabIndex(nextTabIndex++); + // ==High Availability Tab== nextTabIndex = highAvailabilityTab.setTabIndexes(nextTabIndex); isHighlyAvailableEditor.setTabIndex(nextTabIndex++); priorityEditor.setTabIndex(nextTabIndex++); - watchdogModelEditor.setTabIndex(nextTabIndex++); watchdogActionEditor.setTabIndex(nextTabIndex++); + watchdogModelWithPlaceHolderEditor.setTabIndex(nextTabIndex++); // ==Resource Allocation Tab== nextTabIndex = resourceAllocationTab.setTabIndexes(nextTabIndex); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml index 9d33ad8..18119d2 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml @@ -647,11 +647,10 @@ </ge:decorated> </ge:DetachableLabel> <e:EntityModelCellTable ui:field="priorityEditor" addStyleNames="{style.floatLeft}, {style.fullWidth}"/> - </g:FlowPanel> <g:FlowPanel addStyleNames="{style.sectionPanel}, {style.floatLeft}" ui:field="watchdogPanel"> <g:Label text="{constants.watchdog}" addStyleNames="{style.sectionLabel}"/> - <e:ListModelListBoxEditor ui:field="watchdogModelEditor" /> + <e:ListModelTypeAheadChangeableListBoxEditor ui:field="watchdogModelWithPlaceHolderEditor" /> <e:ListModelListBoxEditor ui:field="watchdogActionEditor" /> </g:FlowPanel> </g:FlowPanel> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java index 7bdf852..d4fe7e8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/instancetypes/InstanceTypeListModel.java @@ -387,7 +387,7 @@ } private void setVmWatchdogToParams(final UnitVmModel model, VmTemplateParametersBase updateVmParams) { - VmWatchdogType wdModel = model.getWatchdogModel().getSelectedItem(); + VmWatchdogType wdModel = VmWatchdogType.getByName(model.getWatchdogModelWithPlaceHolderEditor().getSelectedItem()); updateVmParams.setUpdateWatchdog(true); if (wdModel != null) { VmWatchdog vmWatchdog = new VmWatchdog(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java index 22aa20a..fce1b08 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/templates/TemplateListModel.java @@ -673,7 +673,7 @@ } private void setVmWatchdogToParams(final UnitVmModel model, UpdateVmTemplateParameters updateVmParams) { - VmWatchdogType wdModel = model.getWatchdogModel().getSelectedItem(); + VmWatchdogType wdModel = VmWatchdogType.getByName(model.getWatchdogModelWithPlaceHolderEditor().getSelectedItem()); updateVmParams.setUpdateWatchdog(true); if(wdModel != null) { VmWatchdog vmWatchdog = new VmWatchdog(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java index 5bcbd87..02daa82 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/TemplateVmModelBehavior.java @@ -106,7 +106,7 @@ ((VdcQueryReturnValue) returnValue).getReturnValue(); for (VmWatchdog watchdog : watchdogs) { model.getWatchdogAction().setSelectedItem(watchdog.getAction()); - model.getWatchdogModel().setSelectedItem(watchdog.getModel()); + model.getWatchdogModelWithPlaceHolderEditor().setSelectedItem(watchdog.getModel().toString()); } } }), template.getId()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java index 1760199..f1aa603 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java @@ -238,6 +238,9 @@ getIsRunAndPause().setIsChangable(false); getIsDeleteProtected().setIsChangable(false); + // ==High Availability Tab== + getWatchdogModelWithPlaceHolderEditor().setIsChangable(false); + // ==Initial run Tab== getTimeZone().setIsChangable(false); @@ -459,6 +462,16 @@ private void setEmulatedMachine(NotChangableForVmInPoolListModel<String> emulatedMachine) { this.emulatedMachine = emulatedMachine; + } + + private NotChangableForVmInPoolListModel<String> watchdogModelWithPlaceHolder; + + public ListModel<String> getWatchdogModelWithPlaceHolderEditor() { + return watchdogModelWithPlaceHolder; + } + + private void setWatchdogModelWithPlaceHolderEditor(NotChangableForVmInPoolListModel<String> watchdogModel) { + this.watchdogModelWithPlaceHolder = watchdogModel; } private NotChangableForVmInPoolListModel<String> customCpu; @@ -1657,9 +1670,6 @@ } getWatchdogAction().setItems(watchDogActions); - setWatchdogModel(new NotChangableForVmInPoolListModel<VmWatchdogType>()); - getWatchdogModel().getEntityChangedEvent().addListener(this); - setIsAutoAssign(new NotChangableForVmInPoolEntityModel<Boolean>()); getIsAutoAssign().getEntityChangedEvent().addListener(this); @@ -1732,6 +1742,10 @@ setCpuProfiles(new NotChangableForVmInPoolListModel<CpuProfile>()); getCpuProfiles().setIsAvailable(false); + setWatchdogModelWithPlaceHolderEditor(new NotChangableForVmInPoolListModel<String>()); +// getWatchdogModelWithPlaceHolderEditor().getEntityChangedEvent().addListener(this); + + setNumaTuneMode(new NotChangableForVmInPoolListModel<NumaTuneMode>()); getNumaTuneMode().setItems(AsyncDataProvider.getInstance().getNumaTuneModeList()); getNumaTuneMode().setSelectedItem(NumaTuneMode.INTERLEAVE); @@ -1792,6 +1806,7 @@ initVncKeyboardLayout(); behavior.initialize(SystemTreeSelectedItem); + getWatchdogModelWithPlaceHolderEditor().setSelectedItem(null); } @Override @@ -1822,6 +1837,11 @@ behavior.updateEmulatedMachines(); behavior.updateCustomCpu(); } + else if (sender == getWatchdogModelWithPlaceHolderEditor()) + { + watchdogModelWithPlaceHolderEditor_SelectedItemChanged(sender, args); + } + else if (sender == getTemplate()) { template_SelectedItemChanged(sender, args); @@ -1891,11 +1911,12 @@ } else if (ev.matchesDefinition(EntityModel.entityChangedEventDefinition)) { - if (sender == getVmInitEnabled()) { + if (sender == getWatchdogModelWithPlaceHolderEditor()) { + watchdogModelWithPlaceHolderEditor_SelectedItemChanged(sender, args); + } else if (sender == getVmInitEnabled()) { vmInitEnabledChanged(); } - else if (sender == getMemSize()) - { + else if (sender == getMemSize()) { memSize_EntityChanged(sender, args); } else if (sender == getTotalCPUCores()) @@ -1924,8 +1945,6 @@ if (getProvisioningClone_IsSelected().getEntity()) { getProvisioning().setEntity(true); } - } else if (sender == getWatchdogModel()) { - WatchdogModel_EntityChanged(sender, args); } else if (sender == getIsHighlyAvailable()) { behavior.updateMigrationAvailability(); } else if (sender == getOverrideMigrationDowntime()) { @@ -1959,15 +1978,6 @@ private void vmTypeChanged() { behavior.vmTypeChanged(getVmType().getSelectedItem()); - } - - private void WatchdogModel_EntityChanged(Object sender, EventArgs args) { - if (getWatchdogModel().getEntity() == null) { - getWatchdogAction().setIsChangable(false); - getWatchdogAction().setSelectedItem(null); //$NON-NLS-1$ - } else { - getWatchdogAction().setIsChangable(true); - } } private int queryCounter; @@ -2073,6 +2083,17 @@ } else if (policies.size() > 0) { getUsbPolicy().setSelectedItem(policies.iterator().next()); } + } + } + + private void watchdogModelWithPlaceHolderEditor_SelectedItemChanged(Object sender, EventArgs args) { + System.out.println(new Exception().getStackTrace()[0].getMethodName()); + + if (getWatchdogModelWithPlaceHolderEditor().getSelectedItem() == null) { + getWatchdogAction().setIsChangable(false); + getWatchdogAction().setSelectedItem(null); //$NON-NLS-1$ + } else { + getWatchdogAction().setIsChangable(true); } } @@ -2326,7 +2347,7 @@ private void updateWatchdogModels(Integer osType) { VDSGroup cluster = getSelectedCluster(); - if (osType != null && cluster != null && getWatchdogModel() != null) { + if (osType != null && cluster != null && getWatchdogModelWithPlaceHolderEditor() != null) { AsyncQuery asyncQuery = new AsyncQuery(); asyncQuery.asyncCallback = new INewAsyncCallback() { @Override @@ -2347,16 +2368,21 @@ public void updateWatchdogItems(Set<VmWatchdogType> vmWatchdogTypes) { List<VmWatchdogType> watchDogModels = new ArrayList<VmWatchdogType>(); + List<String> watchDogModelsStrings = new ArrayList<String>(); + for (VmWatchdogType vmWatchdogType : vmWatchdogTypes) { watchDogModels.add(vmWatchdogType); + watchDogModelsStrings.add(vmWatchdogType.toString()); } watchDogModels.add(0, null); - VmWatchdogType oldWatchdogSelected = getWatchdogModel().getSelectedItem(); - getWatchdogModel().setItems(watchDogModels); + watchDogModelsStrings.add(0, null); - if (watchDogModels.contains(oldWatchdogSelected)) { - getWatchdogModel().setSelectedItem(oldWatchdogSelected); + getWatchdogModelWithPlaceHolderEditor().setItems(watchDogModelsStrings); + + String old_watchdog_selected_string = getWatchdogModelWithPlaceHolderEditor().getSelectedItem(); + if (watchDogModelsStrings.contains(old_watchdog_selected_string)) { + getWatchdogModelWithPlaceHolderEditor().setSelectedItem(old_watchdog_selected_string); } } @@ -3073,16 +3099,6 @@ } return this; } - } - - private ListModel<VmWatchdogType> watchdogModel; - - public ListModel<VmWatchdogType> getWatchdogModel() { - return watchdogModel; - } - - public void setWatchdogModel(ListModel<VmWatchdogType> watchdogModel) { - this.watchdogModel = watchdogModel; } private ListModel<VmWatchdogAction> watchdogAction; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java index 753917b..3bdf9f9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmListModel.java @@ -2183,7 +2183,8 @@ } private void setVmWatchdogToParams(final UnitVmModel model, VmManagementParametersBase updateVmParams) { - VmWatchdogType wdModel = model.getWatchdogModel().getSelectedItem(); + VmWatchdogType wdModel = VmWatchdogType.getByName(model.getWatchdogModelWithPlaceHolderEditor().getSelectedItem()); + updateVmParams.setUpdateWatchdog(true); if (wdModel != null) { VmWatchdog vmWatchdog = new VmWatchdog(); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/ExistingInstanceTypeModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/ExistingInstanceTypeModelBehavior.java index e50f045..4765473 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/ExistingInstanceTypeModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/ExistingInstanceTypeModelBehavior.java @@ -117,7 +117,7 @@ ((VdcQueryReturnValue) returnValue).getReturnValue(); for (VmWatchdog watchdog : watchdogs) { model.getWatchdogAction().setSelectedItem(watchdog.getAction()); - model.getWatchdogModel().setSelectedItem(watchdog.getModel()); + model.getWatchdogModelWithPlaceHolderEditor().setSelectedItem(watchdog.getModel().toString()); } } }), instanceType.getId()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/InstanceTypeManager.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/InstanceTypeManager.java index b4ca8e8..ca0772d 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/InstanceTypeManager.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/instancetypes/InstanceTypeManager.java @@ -348,15 +348,15 @@ if (watchdogs.size() == 0) { model.getWatchdogAction().setSelectedItem(model.getWatchdogAction().getItems().iterator().next()); - model.getWatchdogModel().setSelectedItem(model.getWatchdogModel().getItems().iterator().next()); + model.getWatchdogModelWithPlaceHolderEditor().setSelectedItem(model.getWatchdogModelWithPlaceHolderEditor().getItems().iterator().next()); } for (VmWatchdog watchdog : watchdogs) { if (watchdogAvailable(watchdog.getModel())) { model.getWatchdogAction().setSelectedItem(watchdog.getAction() == null ? null : watchdog.getAction()); - model.getWatchdogModel().setSelectedItem(watchdog.getModel() == null ? null //$NON-NLS-1$ - : watchdog.getModel()); + model.getWatchdogModelWithPlaceHolderEditor().setSelectedItem(watchdog.getModel() == null ? "" //$NON-NLS-1$ + : watchdog.getModel().toString()); } } activate(); @@ -437,7 +437,9 @@ } private boolean watchdogAvailable(VmWatchdogType watchdogModel) { - for (VmWatchdogType availableWatchdogModel : model.getWatchdogModel().getItems()) { + for (String availableWatchdogModelString : model.getWatchdogModelWithPlaceHolderEditor().getItems()) { + VmWatchdogType availableWatchdogModel = VmWatchdogType.getByName(availableWatchdogModelString); + if (watchdogModel == null && availableWatchdogModel == null) { return true; } -- To view, visit http://gerrit.ovirt.org/36688 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice4111935a0ec3bb29237660702e536adbc34d14 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomer Saban <tsa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
