Gilad Chaplik has uploaded a new change for review. Change subject: engine: block editing migraion fields while VM !Down ......................................................................
engine: block editing migraion fields while VM !Down While the VM isn't down blocked editing migration and pinToHost fields in engine, and added a tooltip in UI. Change-Id: If9fb2fc0755317a8d4be7628b56966d82e9adc3a Bug-Url: https://bugzilla.redhat.com/735260 Signed-off-by: Gilad Chaplik <gchap...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java 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 4 files changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/19937/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java index b96f0d6..1e367f3 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java @@ -205,7 +205,7 @@ @OvfExportOnlyField(valueToIgnore = "MIGRATABLE", exportOption = ExportOption.EXPORT_NON_IGNORED_VALUES) private MigrationSupport migrationSupport; - @EditableField + @EditableOnVmStatusField private Guid dedicatedVmForVds; @EditableOnVmStatusField 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 9353f74..bea4d9a 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 @@ -1569,4 +1569,7 @@ @DefaultStringValue("FQDN") String fqdn(); + + @DefaultStringValue("The fields under 'Start Running On' and 'Migration Options' aren't editable while the VM isn't down") + String nonEditableMigrationFieldsWhileVmNotDownInfo(); } 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 ae45404..d0bde94 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 @@ -413,6 +413,9 @@ public Label specificHostLabel; @UiField(provided = true) + public InfoIcon nonEditableWhileVmNotDownInfo; + + @UiField(provided = true) @Path(value = "defaultHost.selectedItem") @WithElementId("defaultHost") public ListModelListBoxEditor<Object> defaultHostEditor; @@ -640,6 +643,9 @@ .replaceAll("(\r\n|\n)", "<br />")), resources);//$NON-NLS-1$ //$NON-NLS-2$ isVirtioScsiEnabledInfoIcon = new InfoIcon(applicationTemplates.italicText(constants.isVirtioScsiEnabledInfo()), resources); + nonEditableWhileVmNotDownInfo = + new InfoIcon(applicationTemplates.italicText(constants.nonEditableMigrationFieldsWhileVmNotDownInfo()), + resources); priorityEditor = new EntityModelCellTable<ListModel>( (Resources) GWT.create(ButtonCellTableResources.class)); disksAllocationView = new DisksAllocationView(constants); 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 bf1dfad..5c2e4aa 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 @@ -470,6 +470,7 @@ <t:DialogTab ui:field="hostTab"> <t:content> <g:FlowPanel> + <d:InfoIcon ui:field="nonEditableWhileVmNotDownInfo" addStyleNames="{style.labelToCoupleCoupleLeft}"/> <g:Label addStyleNames="{style.sectionLabel}" text="{constants.runOnVmPopup}" /> <g:VerticalPanel addStyleNames="{style.runHostPanel}" verticalAlignment='ALIGN_MIDDLE'> <e:EntityModelRadioButtonEditor ui:field="isAutoAssignEditor" -- To view, visit http://gerrit.ovirt.org/19937 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9fb2fc0755317a8d4be7628b56966d82e9adc3a Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
