Shahar Havivi has uploaded a new change for review. Change subject: core: Set Sysprep domain to editable field ......................................................................
core: Set Sysprep domain to editable field Currently we have a close list of domains (which is set via engine-manage-domains tool) Change-Id: I0370e63593035e80851852dca40a480fdccf46fa Bug-Url: https://bugzilla.redhat.com/1072414 Signed-off-by: Shahar Havivi <shah...@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/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/AbstractVmPopupWidget.ui.xml M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.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/VmInitModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java 12 files changed, 48 insertions(+), 82 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/26500/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 42d970d..a662ede 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,11 +1,12 @@ 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.event.shared.EventBus; 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; @@ -82,6 +83,7 @@ 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 com.google.gwt.resources.client.CssResource; import com.google.gwt.safehtml.shared.SafeHtmlUtils; import com.google.gwt.text.shared.AbstractRenderer; @@ -98,7 +100,6 @@ 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 static org.ovirt.engine.ui.common.widget.uicommon.popup.vm.PopupWidgetConfig.simpleField; public abstract class AbstractVmPopupWidget extends AbstractModeSwitchingPopupWidget<UnitVmModel> { @@ -380,10 +381,6 @@ @UiField protected DialogTab initialRunTab; - @UiField(provided = true) - @Path(value = "domain.selectedItem") - @WithElementId("domain") - public ListModelListBoxEditor<String> domainEditor; @UiField @Path(value = "vmInitEnabled.entity") @@ -967,14 +964,6 @@ } }, new ModeSwitchingVisibilityRenderer()); - // Windows Sysprep - domainEditor = new ListModelListBoxEditor<String>(new NullSafeRenderer<String>() { - @Override - public String renderNullSafe(String object) { - return object.toString(); - } - }, new ModeSwitchingVisibilityRenderer()); - timeZoneEditor = new ListModelListBoxEditor<TimeZoneModel>(new NullSafeRenderer<TimeZoneModel>() { @Override public String renderNullSafe(TimeZoneModel timeZone) { @@ -1103,7 +1092,6 @@ // initial run Tab initialRunTab.setLabel(constants.initialRunVmPopup()); - domainEditor.setLabel(constants.domainVmPopup()); timeZoneEditor.setLabel(constants.tzVmPopup()); vmInitEnabledEditor.setLabel(constants.cloudInitOrSysprep()); @@ -1305,7 +1293,6 @@ if (object.getSysprepEnabled().getEntity() != null) { boolean sysprepEnabled = object.getSysprepEnabled().getEntity(); vmInitEditor.setSyspepContentVisible(object.getSysprepEnabled().getEntity()); - domainEditor.setVisible(sysprepEnabled); } } }); @@ -1351,7 +1338,6 @@ public void eventRaised(Event ev, Object sender, EventArgs args) { String propName = ((PropertyChangedEventArgs) args).propertyName; if ("IsWindowsOS".equals(propName)) { //$NON-NLS-1$ - domainEditor.setEnabled(vm.getIsWindowsOS()); } else if ("IsGeneralTabValid".equals(propName)) { //$NON-NLS-1$ if (vm.getIsGeneralTabValid()) { generalTab.markAsValid(); @@ -1563,7 +1549,6 @@ // ==Initial run Tab== nextTabIndex = initialRunTab.setTabIndexes(nextTabIndex); timeZoneEditor.setTabIndex(nextTabIndex++); - domainEditor.setTabIndex(nextTabIndex++); // ==Console Tab== nextTabIndex = consoleTab.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 4b147dc..7124730 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 @@ -471,8 +471,6 @@ <t:content> <g:FlowPanel> <ge:EntityModelCheckBoxEditor ui:field="vmInitEnabledEditor"/> - - <e:ListModelListBoxEditor ui:field="domainEditor" /> <vm:VmPopupVmInitWidget ui:field="vmInitEditor" /> </g:FlowPanel> </t:content> diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java index f1f9bbc..3098041 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.java @@ -13,6 +13,7 @@ import org.ovirt.engine.ui.common.widget.dialog.InfoIcon; import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor; import org.ovirt.engine.ui.common.widget.editor.generic.EntityModelCheckBoxEditor; +import org.ovirt.engine.ui.common.widget.editor.generic.ListModelSuggestBoxEditor; import org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelPasswordBoxEditor; import org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelTextAreaEditor; import org.ovirt.engine.ui.common.widget.editor.generic.StringEntityModelTextBoxEditor; @@ -109,6 +110,11 @@ @Path(value = "windowsHostname.entity") @WithElementId StringEntityModelTextBoxEditor windowsHostnameEditor; + + @UiField + @Path(value = "sysprepDomain.entity") + @WithElementId + public ListModelSuggestBoxEditor sysprepDomainEditor; @UiField @Path(value = "inputLocale.entity") @@ -372,6 +378,7 @@ void localize() { hostnameEditor.setLabel(constants.cloudInitHostnameLabel()); windowsHostnameEditor.setLabel(constants.cloudInitHostnameLabel()); + sysprepDomainEditor.setLabel(constants.domainVmPopup()); inputLocaleEditor.setLabel(constants.inputLocaleLabel()); uiLanguageEditor.setLabel(constants.uiLanguageLabel()); sysprepScriptEditor.setTitle(constants.sysprepLabel()); diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml index eeb640f..56f7c78 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/popup/vm/VmInitWidget.ui.xml @@ -59,6 +59,7 @@ <g:FlowPanel addStyleNames="{style.verticalPanel}" ui:field="mainPanel"> <g:FlowPanel ui:field="syspreptOptionsContent"> <ge:StringEntityModelTextBoxEditor ui:field="windowsHostnameEditor" /> + <ge:ListModelSuggestBoxEditor ui:field="sysprepDomainEditor" /> <ge:EntityModelCheckBoxEditor ui:field="windowsSyspreptimeZoneEnabledEditor" /> <e:ListModelListBoxEditor ui:field="windowsSysprepTimeZoneEditor" /> <ge:StringEntityModelTextBoxEditor ui:field="inputLocaleEditor" /> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java index 8f671be..b7879e7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ExistingVmModelBehavior.java @@ -251,9 +251,6 @@ updateTimeZone(vm.getTimeZone()); - // Update domain list - updateDomain(); - updateHostPinning(vm.getMigrationSupport()); getModel().getHostCpu().setEntity(vm.isUseHostCpuFlags()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java index 6f97d51..bb820f9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewTemplateVmModelBehavior.java @@ -320,9 +320,6 @@ updateTimeZone(this.vm.getTimeZone()); updateConsoleDevice(this.vm.getId()); - // Update domain list - updateDomain(); - getModel().getStorageDomain().setIsChangable(true); getModel().getProvisioning().setIsAvailable(false); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java index fb38877..75869d4 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/NewVmModelBehavior.java @@ -118,9 +118,6 @@ updateVirtioScsiEnabled(template.getId(), template.getOsId()); updateTimeZone(template.getTimeZone()); - // Update domain list - updateDomain(); - // Update display protocol selected item EntityModel<DisplayType> displayProtocol = null; boolean isFirst = true; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java index 8d54fbe..80ff728 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java @@ -135,9 +135,6 @@ updateConsoleDevice(vmBase.getId()); updateVirtioScsiEnabled(vmBase.getId(), vmBase.getOsId()); - // Update domain list - updateDomain(); - // Update display protocol selected item EntityModel<DisplayType> displayProtocol = null; boolean isFirst = true; 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 2524e42..9b1cee9 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 @@ -196,9 +196,6 @@ updateTimeZone(template.getTimeZone()); - // Update domain list - updateDomain(); - // Storage domain and provisioning are not available for an existing VM. getModel().getStorageDomain().setIsChangable(false); getModel().getProvisioning().setIsAvailable(false); 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 877d7c7..f5b20a5 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 @@ -193,7 +193,6 @@ // ==Initial run Tab== getTimeZone().setIsChangable(false); - getDomain().setIsChangable(false); // ==Console Tab== getDisplayProtocol().setIsChangable(false); @@ -594,18 +593,6 @@ private void setTemplateVersionName(NotChangableForVmInPoolEntityModel<String> value) { templateVersionName = value; - } - - private NotChangableForVmInPoolListModel<String> privateDomain; - - public ListModel<String> getDomain() - { - return privateDomain; - } - - private void setDomain(NotChangableForVmInPoolListModel<String> value) - { - privateDomain = value; } private NotChangableForVmInPoolEntityModel<Integer> privateMemSize; @@ -1284,7 +1271,6 @@ setAllowConsoleReconnect(new NotChangableForVmInPoolEntityModel<Boolean>()); setDescription(new NotChangableForVmInPoolEntityModel<String>()); setComment(new NotChangableForVmInPoolEntityModel<String>()); - setDomain(new NotChangableForVmInPoolListModel<String>()); setMinAllocatedMemory(new NotChangableForVmInPoolEntityModel<Integer>()); setUsbPolicy(new NotChangableForVmInPoolListModel<UsbPolicy>()); setIsStateless(new NotChangableForVmInPoolEntityModel<Boolean>()); @@ -1927,8 +1913,6 @@ getKernel_parameters().setIsChangable(getIsLinuxOS()); getKernel_parameters().setIsAvailable(getIsLinuxOS()); - getDomain().setIsChangable(getIsWindowsOS()); - getBehavior().updateDefaultTimeZone(); @@ -2412,7 +2396,7 @@ && getTemplate().getIsValid() && getMinAllocatedMemory().getIsValid()); - setIsFirstRunTabValid(getDomain().getIsValid() && getTimeZone().getIsValid()); + setIsFirstRunTabValid(getTimeZone().getIsValid()); setIsDisplayTabValid(getUsbPolicy().getIsValid() && getNumOfMonitors().getIsValid() && getSpiceProxy().getIsValid()); setIsHostTabValid(getDefaultHost().getIsValid() && getMigrationDowntime().getIsValid()); setIsAllocationTabValid(getDisksAllocationModel().getIsValid() && getMinAllocatedMemory().getIsValid() @@ -2427,7 +2411,7 @@ return getName().getIsValid() && getDescription().getIsValid() && getDataCenterWithClustersList().getIsValid() && getDisksAllocationModel().getIsValid() && getTemplate().getIsValid() && getComment().getIsValid() && getDefaultHost().getIsValid() && getMinAllocatedMemory().getIsValid() - && getNumOfMonitors().getIsValid() && getDomain().getIsValid() && getUsbPolicy().getIsValid() + && getNumOfMonitors().getIsValid() && getUsbPolicy().getIsValid() && getTimeZone().getIsValid() && getOSType().getIsValid() && getCdImage().getIsValid() && getKernel_path().getIsValid() && getInitrd_path().getIsValid() diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java index c983843..de5f3d8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmInitModel.java @@ -15,6 +15,8 @@ import org.ovirt.engine.core.common.businessentities.VmInitNetwork; import org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol; import org.ovirt.engine.core.compat.StringHelper; +import org.ovirt.engine.ui.frontend.AsyncQuery; +import org.ovirt.engine.ui.frontend.INewAsyncCallback; import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.Linq.IPredicate; import org.ovirt.engine.ui.uicommonweb.UICommand; @@ -78,6 +80,15 @@ private void setHostname(EntityModel<String> value) { privateHostname = value; + } + + private ListModel<String> privateSysprepDomain; + public ListModel<String> getSysprepDomain() { + return privateSysprepDomain; + } + + private void setSysprepDomain(ListModel<String> value) { + privateSysprepDomain = value; } private EntityModel<String> privateInputLocale; @@ -402,6 +413,7 @@ setWindowsSysprepTimeZone(new ListModel<Map.Entry<String, String>>()); setWindowsSysprepTimeZoneEnabled(new EntityModel<Boolean>()); setWindowsHostname(new EntityModel<String>()); + setSysprepDomain(new ListModel<String>()); setInputLocale(new EntityModel<String>()); setUiLanguage(new EntityModel<String>()); setSystemLocale(new EntityModel<String>()); @@ -460,6 +472,7 @@ } public void init(final VmBase vm) { + updateDomain(); getWindowsSysprepTimeZoneEnabled().setEntity(false); getRegenerateKeysEnabled().setEntity(false); getTimeZoneEnabled().setEntity(false); @@ -513,6 +526,10 @@ getHostname().setEntity(vmInit.getHostname()); getWindowsHostname().setEntity(vmInit.getHostname()); } + if (!StringHelper.isNullOrEmpty(vmInit.getDomain())) { + getSysprepDomain().setEntity(vmInit.getDomain()); + getDomain().setEntity(vmInit.getDomain()); + } if (!StringHelper.isNullOrEmpty(vmInit.getInputLocale())) { getInputLocale().setEntity(vmInit.getInputLocale()); } @@ -525,7 +542,7 @@ if (!StringHelper.isNullOrEmpty(vmInit.getUserLocale())) { getUserLocale().setEntity(vmInit.getUserLocale()); } - getDomain().setEntity(vmInit.getDomain()); + final String tz = vmInit.getTimeZone(); if (!StringHelper.isNullOrEmpty(tz)) { if (AsyncDataProvider.isWindowsOsType(vm.getOsId())) { @@ -754,7 +771,7 @@ public VmInit buildCloudInitParameters(UnitVmModel model) { if (model.getVmInitEnabled().getEntity() || model.getSysprepEnabled().getEntity()) { - return buildModelSpecificParameters(model.getIsWindowsOS(), model.getDomain().getEntity()); + return buildModelSpecificParameters(model.getIsWindowsOS()); } else { return null; } @@ -763,13 +780,13 @@ public VmInit buildCloudInitParameters(RunOnceModel model) { if (model.getIsSysprepEnabled().getEntity() || model.getIsCloudInitEnabled().getEntity()) { - return buildModelSpecificParameters(model.getIsWindowsOS(), model.getSysPrepSelectedDomainName().getEntity()); + return buildModelSpecificParameters(model.getIsWindowsOS()); } else { return null; } } - private VmInit buildModelSpecificParameters(boolean isWindows, String domainFromModel) { + private VmInit buildModelSpecificParameters(boolean isWindows) { VmInit vmInit = buildCloudInitParameters(); if (isWindows && getWindowsSysprepTimeZoneEnabled().getEntity()) { Map.Entry<String, String> entry = getWindowsSysprepTimeZone().getSelectedItem(); @@ -780,7 +797,7 @@ } if (isWindows) { - vmInit.setDomain(domainFromModel); + vmInit.setDomain(getSysprepDomain().getEntity()); } else { vmInit.setDomain(getDomain().getEntity()); } @@ -971,4 +988,17 @@ isWindowsOS = AsyncDataProvider.isWindowsOsType(selectedItem); getDomain().setIsAvailable(selectedItem != null && isWindowsOS); } + + protected void updateDomain() + { + AsyncDataProvider.getDomainList(new AsyncQuery(this, + new INewAsyncCallback() { + @Override + public void onSuccess(Object target, Object returnValue) { + List<String> domains = (List<String>) returnValue; + getSysprepDomain().setItems(domains); + } + }), + true); + } } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java index 12eb0f8..45a08b0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmModelBehaviorBase.java @@ -330,30 +330,6 @@ : TimeZoneType.GENERAL_TIMEZONE; } - protected void updateDomain() - { - AsyncDataProvider.getDomainList(new AsyncQuery(this, - new INewAsyncCallback() { - @Override - public void onSuccess(Object target, Object returnValue) { - - VmModelBehaviorBase behavior = (VmModelBehaviorBase) target; - List<String> domains = (List<String>) returnValue; - String oldDomain = behavior.getModel().getDomain().getSelectedItem(); - if (oldDomain != null && !oldDomain.equals("") && !domains.contains(oldDomain)) //$NON-NLS-1$ - { - domains.add(0, oldDomain); - } - behavior.getModel().getDomain().setItems(domains); - behavior.getModel() - .getDomain() - .setSelectedItem((oldDomain != null) ? oldDomain : Linq.firstOrDefault(domains)); - - } - }, getModel().getHash()), - true); - } - private Integer cachedMaxPriority; protected void initPriority(int priority) -- To view, visit http://gerrit.ovirt.org/26500 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0370e63593035e80851852dca40a480fdccf46fa Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <shav...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
