Martin Beták has uploaded a new change for review. Change subject: engine: Do not show 'Linux boot options' for OS types - Unassigned, Other ......................................................................
engine: Do not show 'Linux boot options' for OS types - Unassigned, Other Linux boot options are now visible only for Linux OS types, not for Unassigned or Other. Also changed the name of related IsLinux_Unassign_UnknownOS property to IsLinuxOS since it is used exactly for the purpose of determining whether to show the Linux Boot Options or not. Change-Id: I107207f28575f097e2bdf9620bb63d51116a9515 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=909127 Signed-off-by: Martin Betak <[email protected]> --- 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/userportal/UserPortalListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.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 6 files changed, 30 insertions(+), 33 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/12811/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 a3a4c8e..0866137 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 @@ -944,8 +944,8 @@ @Override public void eventRaised(Event ev, Object sender, EventArgs args) { String propName = ((PropertyChangedEventArgs) args).PropertyName; - if ("IsLinux_Unassign_UnknownOS".equals(propName)) { //$NON-NLS-1$ - linuxBootOptionsPanel.setVisible(vm.getIsLinux_Unassign_UnknownOS()); + if ("IsLinuxOS".equals(propName)) { //$NON-NLS-1$ + linuxBootOptionsPanel.setVisible(vm.getIsLinuxOS()); } } }); 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 b8ee1e6..1288d98 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 @@ -404,7 +404,7 @@ <e:ListModelListBoxEditor ui:field="cdImageEditor" /> </g:HorizontalPanel> </g:FlowPanel> - <g:FlowPanel ui:field="linuxBootOptionsPanel" addStyleNames="{style.sectionPanel}"> + <g:FlowPanel ui:field="linuxBootOptionsPanel" addStyleNames="{style.sectionPanel}" visible="false"> <g:Label addStyleNames="{style.sectionLabel}" text="{constants.linuxBootOptionsVmPopup}" /> <e:EntityModelTextBoxEditor ui:field="kernel_pathEditor" /> <e:EntityModelTextBoxEditor ui:field="initrd_pathEditor" /> diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java index 4771698..6e244f9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/userportal/UserPortalListModel.java @@ -22,6 +22,7 @@ import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.MigrationSupport; import org.ovirt.engine.core.common.businessentities.Quota; +import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.UsbPolicy; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; @@ -32,7 +33,6 @@ import org.ovirt.engine.core.common.businessentities.VmTemplate; import org.ovirt.engine.core.common.businessentities.VmType; import org.ovirt.engine.core.common.businessentities.VolumeType; -import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.businessentities.network.VmNetworkInterface; import org.ovirt.engine.core.common.queries.GetAllDisksByVmIdParameters; @@ -732,10 +732,9 @@ model.getCustomProperties().setEntity(vm.getCustomProperties()); - model.setIsLinux_Unassign_UnknownOS(AsyncDataProvider.IsLinuxOsType(vm.getVmOs()) - || vm.getVmOs() == VmOsType.Unassigned || vm.getVmOs() == VmOsType.Other); + model.setIsLinuxOS(AsyncDataProvider.IsLinuxOsType(vm.getVmOs())); - model.getIsLinuxOptionsAvailable().setEntity(model.getIsLinux_Unassign_UnknownOS()); + model.getIsLinuxOptionsAvailable().setEntity(model.getIsLinuxOS()); model.setIsWindowsOS(AsyncDataProvider.IsWindowsOsType(vm.getVmOs())); model.getIsVmFirstRun().setEntity(!vm.isInitialized()); model.getSysPrepDomainName().setSelectedItem(vm.getVmDomain()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java index 9496630..857254c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/RunOnceModel.java @@ -279,16 +279,16 @@ privateDisplayConsole_Spice_IsSelected = value; } - private boolean privateIsLinux_Unassign_UnknownOS; + private boolean privateIsLinuxOS; - public boolean getIsLinux_Unassign_UnknownOS() + public boolean getIsLinuxOS() { - return privateIsLinux_Unassign_UnknownOS; + return privateIsLinuxOS; } - public void setIsLinux_Unassign_UnknownOS(boolean value) + public void setIsLinuxOS(boolean value) { - privateIsLinux_Unassign_UnknownOS = value; + privateIsLinuxOS = value; } private boolean privateIsWindowsOS; @@ -619,7 +619,7 @@ //getCustomProperties().ValidateEntity(new IValidation[] { new CustomPropertyValidation(this.getCustomPropertiesKeysList()) }); boolean customPropertyValidation = getCustomPropertySheet().validate(); - if (getIsLinux_Unassign_UnknownOS() + if (getIsLinuxOS() && ((((String) getKernel_parameters().getEntity()).length() > 0 || ((String) getInitrd_path().getEntity()).length() > 0) && ((String) getKernel_path().getEntity()).length() == 0)) { boolean kernelParamInvalid = 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 48e8e51..24754cd 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 @@ -13,12 +13,12 @@ import org.ovirt.engine.core.common.businessentities.DisplayType; import org.ovirt.engine.core.common.businessentities.MigrationSupport; import org.ovirt.engine.core.common.businessentities.QuotaEnforcementTypeEnum; +import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.UsbPolicy; import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.VmOsType; import org.ovirt.engine.core.common.businessentities.VmType; -import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.storage_pool; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.compat.Guid; @@ -203,19 +203,19 @@ } } - private boolean isLinux_Unassign_UnknownOS; + private boolean isLinuxOS; - public boolean getIsLinux_Unassign_UnknownOS() + public boolean getIsLinuxOS() { - return isLinux_Unassign_UnknownOS; + return isLinuxOS; } - public void setIsLinux_Unassign_UnknownOS(boolean value) + public void setIsLinuxOS(boolean value) { - if (isLinux_Unassign_UnknownOS != value) + if (isLinuxOS != value) { - isLinux_Unassign_UnknownOS = value; - OnPropertyChanged(new PropertyChangedEventArgs("IsLinux_Unassign_UnknownOS")); //$NON-NLS-1$ + isLinuxOS = value; + OnPropertyChanged(new PropertyChangedEventArgs("IsLinuxOS")); //$NON-NLS-1$ } } @@ -1564,17 +1564,16 @@ VmOsType osType = (VmOsType) getOSType().getSelectedItem(); setIsWindowsOS(AsyncDataProvider.IsWindowsOsType(osType)); - setIsLinux_Unassign_UnknownOS(AsyncDataProvider.IsLinuxOsType(osType) || osType == VmOsType.Unassigned - || osType == VmOsType.Other); + setIsLinuxOS(AsyncDataProvider.IsLinuxOsType(osType)); - getInitrd_path().setIsChangable(getIsLinux_Unassign_UnknownOS()); - getInitrd_path().setIsAvailable(getIsLinux_Unassign_UnknownOS()); + getInitrd_path().setIsChangable(getIsLinuxOS()); + getInitrd_path().setIsAvailable(getIsLinuxOS()); - getKernel_path().setIsChangable(getIsLinux_Unassign_UnknownOS()); - getKernel_path().setIsAvailable(getIsLinux_Unassign_UnknownOS()); + getKernel_path().setIsChangable(getIsLinuxOS()); + getKernel_path().setIsAvailable(getIsLinuxOS()); - getKernel_parameters().setIsChangable(getIsLinux_Unassign_UnknownOS()); - getKernel_parameters().setIsAvailable(getIsLinux_Unassign_UnknownOS()); + getKernel_parameters().setIsChangable(getIsLinuxOS()); + getKernel_parameters().setIsAvailable(getIsLinuxOS()); getDomain().setIsChangable(getIsWindowsOS()); if (getTimeZone().getSelectedItem() == null) { @@ -1974,7 +1973,7 @@ getInitrd_path().setEntity(""); //$NON-NLS-1$ } - if (isLinux_Unassign_UnknownOS) { + if (isLinuxOS) { getKernel_path().ValidateEntity(new IValidation[] { new NoTrimmingWhitespacesValidation() }); getInitrd_path().ValidateEntity(new IValidation[] { new NoTrimmingWhitespacesValidation() }); getKernel_parameters().ValidateEntity(new IValidation[] { new NoTrimmingWhitespacesValidation() }); 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 9b974b6..4fd5dff 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 @@ -1392,9 +1392,8 @@ model.setCustomPropertiesKeysList(this.getCustomPropertiesKeysList() .get(vm.getVdsGroupCompatibilityVersion())); - model.setIsLinux_Unassign_UnknownOS(AsyncDataProvider.IsLinuxOsType(vm.getVmOs()) - || vm.getVmOs() == VmOsType.Unassigned || vm.getVmOs() == VmOsType.Other); - model.getIsLinuxOptionsAvailable().setEntity(model.getIsLinux_Unassign_UnknownOS()); + model.setIsLinuxOS(AsyncDataProvider.IsLinuxOsType(vm.getVmOs())); + model.getIsLinuxOptionsAvailable().setEntity(model.getIsLinuxOS()); model.setIsWindowsOS(AsyncDataProvider.IsWindowsOsType(vm.getVmOs())); model.getIsVmFirstRun().setEntity(!vm.isInitialized()); model.getSysPrepDomainName().setSelectedItem(vm.getVmDomain()); -- To view, visit http://gerrit.ovirt.org/12811 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I107207f28575f097e2bdf9620bb63d51116a9515 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Beták <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
