Martin Sivák has uploaded a new change for review. Change subject: Fix watchdog configuration for localized webadmin ......................................................................
Fix watchdog configuration for localized webadmin Watchdog settings for type and action were directly translating the possible values. That caused issues during saving as the selected enum value could not be detected due to localization. This updates the code to use the proper way of rendering localized enums. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1135467 Change-Id: Id1ff4c839c112d4a8956cc40f5ee30294c67cc08 Signed-off-by: Martin Sivak <msi...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.java 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 8 files changed, 100 insertions(+), 95 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/32215/1 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 6235139..7dd1f6e 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 @@ -1,16 +1,29 @@ package org.ovirt.engine.ui.common.widget.uicommon.popup; -import static org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfig.simpleField; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - +import com.google.gwt.core.client.GWT; +import com.google.gwt.editor.client.SimpleBeanEditorDriver; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.event.logical.shared.ValueChangeEvent; +import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.google.gwt.event.shared.EventBus; - -import static com.google.gwt.dom.client.Style.Unit; - +import com.google.gwt.resources.client.CssResource; +import com.google.gwt.safehtml.shared.SafeHtmlUtils; +import com.google.gwt.text.shared.AbstractRenderer; +import com.google.gwt.uibinder.client.UiBinder; +import com.google.gwt.uibinder.client.UiField; +import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.user.cellview.client.CellTable; +import com.google.gwt.user.cellview.client.CellTable.Resources; +import com.google.gwt.user.client.ui.ButtonBase; +import com.google.gwt.user.client.ui.FlowPanel; +import com.google.gwt.user.client.ui.HorizontalPanel; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.Panel; +import com.google.gwt.user.client.ui.RadioButton; +import com.google.gwt.user.client.ui.ValueLabel; +import com.google.gwt.user.client.ui.Widget; import org.ovirt.engine.core.common.businessentities.BootSequence; import org.ovirt.engine.core.common.businessentities.Disk; import org.ovirt.engine.core.common.businessentities.Disk.DiskStorageType; @@ -26,6 +39,8 @@ import org.ovirt.engine.core.common.businessentities.VmPoolType; 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; @@ -91,28 +106,12 @@ import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; import org.ovirt.engine.ui.uicompat.external.StringUtils; -import com.google.gwt.core.client.GWT; -import com.google.gwt.editor.client.SimpleBeanEditorDriver; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.event.dom.client.ClickHandler; -import com.google.gwt.event.logical.shared.ValueChangeEvent; -import com.google.gwt.event.logical.shared.ValueChangeHandler; -import com.google.gwt.resources.client.CssResource; -import com.google.gwt.safehtml.shared.SafeHtmlUtils; -import com.google.gwt.text.shared.AbstractRenderer; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.uibinder.client.UiHandler; -import com.google.gwt.user.cellview.client.CellTable; -import com.google.gwt.user.cellview.client.CellTable.Resources; -import com.google.gwt.user.client.ui.ButtonBase; -import com.google.gwt.user.client.ui.FlowPanel; -import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.Label; -import com.google.gwt.user.client.ui.Panel; -import com.google.gwt.user.client.ui.RadioButton; -import com.google.gwt.user.client.ui.ValueLabel; -import com.google.gwt.user.client.ui.Widget; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static com.google.gwt.dom.client.Style.Unit; +import static org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfig.simpleField; public abstract class AbstractVmPopupWidget extends AbstractModeSwitchingPopupWidget<UnitVmModel> { @@ -668,7 +667,7 @@ @UiField(provided = true) @Path(value = "watchdogModel.selectedItem") @WithElementId("watchdogModel") - public ListModelListBoxEditor<String> watchdogModelEditor; + public ListModelListBoxEditor<VmWatchdogType> watchdogModelEditor; @UiField @Ignore @@ -677,7 +676,7 @@ @UiField(provided = true) @Path(value = "watchdogAction.selectedItem") @WithElementId("watchdogAction") - public ListModelListBoxEditor<String> watchdogActionEditor; + public ListModelListBoxEditor<VmWatchdogAction> watchdogActionEditor; // ==Resource Allocation Tab== @UiField @@ -846,8 +845,21 @@ // 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<String>(new ModeSwitchingVisibilityRenderer()); - watchdogActionEditor = new ListModelListBoxEditor<String>(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 + protected String renderNullSafe(VmWatchdogAction object) { + return EnumTranslator.getInstance().get(object); + } + }, new ModeSwitchingVisibilityRenderer()); + isStatelessEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer()); isRunAndPauseEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer()); isDeleteProtectedEditor = new EntityModelCheckBoxEditor(Align.RIGHT, new ModeSwitchingVisibilityRenderer()); 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 c2ae601..a2f6d7b 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 @@ -10,7 +10,6 @@ import org.ovirt.engine.core.common.businessentities.VmEntityType; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmWatchdog; -import org.ovirt.engine.core.common.businessentities.VmWatchdogAction; import org.ovirt.engine.core.common.businessentities.VmWatchdogType; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.queries.IdQueryParameters; @@ -384,13 +383,11 @@ } private void setVmWatchdogToParams(final UnitVmModel model, VmTemplateParametersBase updateVmParams) { - VmWatchdogType wdModel = VmWatchdogType.getByName(model.getWatchdogModel() - .getSelectedItem()); + VmWatchdogType wdModel = model.getWatchdogModel().getSelectedItem(); updateVmParams.setUpdateWatchdog(true); if (wdModel != null) { VmWatchdog vmWatchdog = new VmWatchdog(); - vmWatchdog.setAction(VmWatchdogAction.getByName(model.getWatchdogAction() - .getSelectedItem())); + vmWatchdog.setAction(model.getWatchdogAction().getSelectedItem()); vmWatchdog.setModel(wdModel); updateVmParams.setWatchdog(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 2c7b98e..f0c14e0 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 @@ -1,10 +1,5 @@ package org.ovirt.engine.ui.uicommonweb.models.templates; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - import org.ovirt.engine.core.common.VdcActionUtils; import org.ovirt.engine.core.common.action.MoveOrCopyParameters; import org.ovirt.engine.core.common.action.UpdateVmTemplateParameters; @@ -18,7 +13,6 @@ import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmTemplateStatus; import org.ovirt.engine.core.common.businessentities.VmWatchdog; -import org.ovirt.engine.core.common.businessentities.VmWatchdogAction; import org.ovirt.engine.core.common.businessentities.VmWatchdogType; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.mode.ApplicationMode; @@ -53,6 +47,11 @@ import org.ovirt.engine.ui.uicompat.IFrontendMultipleActionAsyncCallback; import org.ovirt.engine.ui.uicompat.ObservableCollection; import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; public class TemplateListModel extends VmBaseListModel<VmTemplate> implements ISupportSystemTreeContext { @@ -635,13 +634,11 @@ } private void setVmWatchdogToParams(final UnitVmModel model, UpdateVmTemplateParameters updateVmParams) { - VmWatchdogType wdModel = VmWatchdogType.getByName(model.getWatchdogModel() - .getSelectedItem()); + VmWatchdogType wdModel = model.getWatchdogModel().getSelectedItem(); updateVmParams.setUpdateWatchdog(true); if(wdModel != null) { VmWatchdog vmWatchdog = new VmWatchdog(); - vmWatchdog.setAction(VmWatchdogAction.getByName(model.getWatchdogAction() - .getSelectedItem())); + vmWatchdog.setAction(model.getWatchdogAction().getSelectedItem()); vmWatchdog.setModel(wdModel); updateVmParams.setWatchdog(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 77c34a3..6368d73 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 @@ -1,9 +1,5 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.StoragePool; import org.ovirt.engine.core.common.businessentities.VDSGroup; @@ -18,6 +14,11 @@ import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemModel; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; public class TemplateVmModelBehavior extends VmModelBehaviorBase { @@ -101,8 +102,8 @@ Collection<VmWatchdog> watchdogs = ((VdcQueryReturnValue) returnValue).getReturnValue(); for (VmWatchdog watchdog : watchdogs) { - model.getWatchdogAction().setSelectedItem(watchdog.getAction().name().toLowerCase()); - model.getWatchdogModel().setSelectedItem(watchdog.getModel().name()); + model.getWatchdogAction().setSelectedItem(watchdog.getAction()); + model.getWatchdogModel().setSelectedItem(watchdog.getModel()); } } }), 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 769213d..41b0feb 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 @@ -1,15 +1,5 @@ package org.ovirt.engine.ui.uicommonweb.models.vms; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.ovirt.engine.core.common.businessentities.BootSequence; import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.InstanceType; @@ -64,12 +54,21 @@ import org.ovirt.engine.ui.uicommonweb.validation.SpecialAsciiI18NOrNoneValidation; import org.ovirt.engine.ui.uicommonweb.validation.ValidationResult; import org.ovirt.engine.ui.uicompat.ConstantsManager; -import org.ovirt.engine.ui.uicompat.EnumTranslator; import org.ovirt.engine.ui.uicompat.Event; import org.ovirt.engine.ui.uicompat.EventArgs; import org.ovirt.engine.ui.uicompat.IEventListener; import org.ovirt.engine.ui.uicompat.PropertyChangedEventArgs; import org.ovirt.engine.ui.uicompat.UIConstants; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; public class UnitVmModel extends Model { @@ -1598,15 +1597,15 @@ setHostCpu(new NotChangableForVmInPoolEntityModel<Boolean>()); getHostCpu().getEntityChangedEvent().addListener(this); - setWatchdogAction(new NotChangableForVmInPoolListModel<String>()); + setWatchdogAction(new NotChangableForVmInPoolListModel<VmWatchdogAction>()); getWatchdogAction().getEntityChangedEvent().addListener(this); - ArrayList<String> watchDogActions = new ArrayList<String>(); + ArrayList<VmWatchdogAction> watchDogActions = new ArrayList<VmWatchdogAction>(); for (VmWatchdogAction action : VmWatchdogAction.values()) { - watchDogActions.add(EnumTranslator.createAndTranslate(action)); + watchDogActions.add(action); } getWatchdogAction().setItems(watchDogActions); - setWatchdogModel(new NotChangableForVmInPoolListModel<String>()); + setWatchdogModel(new NotChangableForVmInPoolListModel<VmWatchdogType>()); getWatchdogModel().getEntityChangedEvent().addListener(this); setIsAutoAssign(new NotChangableForVmInPoolEntityModel<Boolean>()); @@ -1878,9 +1877,9 @@ } private void WatchdogModel_EntityChanged(Object sender, EventArgs args) { - if ("".equals(getWatchdogModel().getEntity())) { + if (getWatchdogModel().getEntity() == null) { getWatchdogAction().setIsChangable(false); - getWatchdogAction().setSelectedItem(""); //$NON-NLS-1$ + getWatchdogAction().setSelectedItem(null); //$NON-NLS-1$ } else { getWatchdogAction().setIsChangable(true); } @@ -2257,13 +2256,13 @@ } public void updateWatchdogItems(Set<VmWatchdogType> vmWatchdogTypes) { - List<String> watchDogModels = new ArrayList<String>(); + List<VmWatchdogType> watchDogModels = new ArrayList<VmWatchdogType>(); for (VmWatchdogType vmWatchdogType : vmWatchdogTypes) { - watchDogModels.add(EnumTranslator.createAndTranslate(vmWatchdogType)); + watchDogModels.add(vmWatchdogType); } watchDogModels.add(0, null); - String oldWatchdogSelected = (String) getWatchdogModel().getSelectedItem(); + VmWatchdogType oldWatchdogSelected = getWatchdogModel().getSelectedItem(); getWatchdogModel().setItems(watchDogModels); if (watchDogModels.contains(oldWatchdogSelected)) { @@ -2983,23 +2982,23 @@ } } - private ListModel<String> watchdogModel; + private ListModel<VmWatchdogType> watchdogModel; - public ListModel<String> getWatchdogModel() { + public ListModel<VmWatchdogType> getWatchdogModel() { return watchdogModel; } - public void setWatchdogModel(ListModel<String> watchdogModel) { + public void setWatchdogModel(ListModel<VmWatchdogType> watchdogModel) { this.watchdogModel = watchdogModel; } - private ListModel<String> watchdogAction; + private ListModel<VmWatchdogAction> watchdogAction; - public ListModel<String> getWatchdogAction() { + public ListModel<VmWatchdogAction> getWatchdogAction() { return watchdogAction; } - public void setWatchdogAction(ListModel<String> watchdogAction) { + public void setWatchdogAction(ListModel<VmWatchdogAction> watchdogAction) { this.watchdogAction = 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 2903d4d..e43557b 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 @@ -35,7 +35,6 @@ import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmType; import org.ovirt.engine.core.common.businessentities.VmWatchdog; -import org.ovirt.engine.core.common.businessentities.VmWatchdogAction; import org.ovirt.engine.core.common.businessentities.VmWatchdogType; import org.ovirt.engine.core.common.interfaces.SearchType; import org.ovirt.engine.core.common.mode.ApplicationMode; @@ -2257,13 +2256,11 @@ } private void setVmWatchdogToParams(final UnitVmModel model, VmManagementParametersBase updateVmParams) { - VmWatchdogType wdModel = VmWatchdogType.getByName(model.getWatchdogModel() - .getSelectedItem()); + VmWatchdogType wdModel = model.getWatchdogModel().getSelectedItem(); updateVmParams.setUpdateWatchdog(true); if (wdModel != null) { VmWatchdog vmWatchdog = new VmWatchdog(); - vmWatchdog.setAction(VmWatchdogAction.getByName(model.getWatchdogAction() - .getSelectedItem())); + vmWatchdog.setAction(model.getWatchdogAction().getSelectedItem()); vmWatchdog.setModel(wdModel); updateVmParams.setWatchdog(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 f79d101..54d1a08 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 @@ -2,6 +2,7 @@ import org.ovirt.engine.core.common.businessentities.InstanceType; import org.ovirt.engine.core.common.businessentities.UsbPolicy; +import org.ovirt.engine.core.common.businessentities.VmBase; import org.ovirt.engine.core.common.businessentities.VmDevice; import org.ovirt.engine.core.common.businessentities.VmRngDevice; import org.ovirt.engine.core.common.businessentities.VmWatchdog; @@ -108,8 +109,8 @@ Collection<VmWatchdog> watchdogs = ((VdcQueryReturnValue) returnValue).getReturnValue(); for (VmWatchdog watchdog : watchdogs) { - model.getWatchdogAction().setSelectedItem(watchdog.getAction().name().toLowerCase()); - model.getWatchdogModel().setSelectedItem(watchdog.getModel().name()); + model.getWatchdogAction().setSelectedItem(watchdog.getAction()); + model.getWatchdogModel().setSelectedItem(watchdog.getModel()); } } }), 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 342f0e3..6e75609 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 @@ -11,6 +11,7 @@ import org.ovirt.engine.core.common.businessentities.VmRngDevice; import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmWatchdog; +import org.ovirt.engine.core.common.businessentities.VmWatchdogType; import org.ovirt.engine.core.common.queries.IdQueryParameters; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; @@ -316,11 +317,11 @@ } for (VmWatchdog watchdog : watchdogs) { - if (watchdogAvailable(watchdog.getModel().name())) { + if (watchdogAvailable(watchdog.getModel())) { model.getWatchdogAction().setSelectedItem(watchdog.getAction() == null ? null - : watchdog.getAction().name().toLowerCase()); - model.getWatchdogModel().setSelectedItem(watchdog.getModel() == null ? "" //$NON-NLS-1$ - : watchdog.getModel().name()); + : watchdog.getAction()); + model.getWatchdogModel().setSelectedItem(watchdog.getModel() == null ? null //$NON-NLS-1$ + : watchdog.getModel()); } } activate(); @@ -395,8 +396,8 @@ }); } - private boolean watchdogAvailable(String watchdogModel) { - for (String availableWatchdogModel : model.getWatchdogModel().getItems()) { + private boolean watchdogAvailable(VmWatchdogType watchdogModel) { + for (VmWatchdogType availableWatchdogModel : model.getWatchdogModel().getItems()) { if (watchdogModel == null && availableWatchdogModel == null) { return true; } -- To view, visit http://gerrit.ovirt.org/32215 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1ff4c839c112d4a8956cc40f5ee30294c67cc08 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Martin Sivák <msi...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
