Martin Betak has uploaded a new change for review. Change subject: frontend: More descriptive message on attempt to update running VM ......................................................................
frontend: More descriptive message on attempt to update running VM Changed VM_CANNOT_UPDATE_ILLEGAL_FIELD message to be more descriptive and user-friendly. Change-Id: I61c223134bbb3674572c23fa58485e1f500fd368 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=987941 Signed-off-by: Martin Betak <mbe...@redhat.com> --- M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 4 files changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/17594/1 diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index a8069a2..c86dc95 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -24,7 +24,7 @@ VM_TEMPLATE_IMAGE_IS_ILLEGAL=Template's Image is invalid (temporarily). VM_TEMPLATE_IMAGE_LAST_DOMAIN=Template's Image is located only on single domain. VM_NAME_CANNOT_BE_EMPTY=VM Name cannot be empty. -VM_CANNOT_UPDATE_ILLEGAL_FIELD=Failed updating the properties of the VM. This may be caused either by:\n1. The values selected are not appropriate for the VM; or\n2. Its values cannot be updated while the VM is in UP state (Please shut down the VM in order to modify properties such as CPU or cluster). +VM_CANNOT_UPDATE_ILLEGAL_FIELD=There was an attempt to change VM values while the VM is not down. Please shut down the VM in order to modify these properties. VM_CANNOT_RUN_FROM_NETWORK_WITHOUT_NETWORK=VM is configured to be 'Network bootable', but no Network Interface is configured.\n\ Alternatives:\n\ -Select a different boot device (using the 'Run Once' command or 'Edit VM' command on Boot Option Sub-Tab).\n\ diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java index 004da1a..ce3cc68 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java @@ -76,7 +76,7 @@ @DefaultStringValue("VM Name cannot be empty.") String VM_NAME_CANNOT_BE_EMPTY(); - @DefaultStringValue("Failed updating the properties of the VM. This may be caused either by:\n1. The values selected are not appropriate for the VM; or\n2. Its values cannot be updated while the VM is in UP state (Please shut down the VM in order to modify properties such as CPU or cluster).") + @DefaultStringValue("There was an attempt to change VM values while the VM is not down. Please shut down the VM in order to modify these properties.") String VM_CANNOT_UPDATE_ILLEGAL_FIELD(); @DefaultStringValue("VM is configured to be 'Network bootable', but no Network Interface is configured.\nAlternatives:\n-Select a different boot device (using the 'Run Once' command or 'Edit VM' command on Boot Option Sub-Tab).\n-Configure Network Interface and rerun the VM.") diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 8315dd9..edaf99e 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -24,7 +24,7 @@ VM_TEMPLATE_IMAGE_IS_ILLEGAL=Template's Image is invalid (temporarily). VM_TEMPLATE_IMAGE_LAST_DOMAIN=Template's Image is located only on single domain. VM_NAME_CANNOT_BE_EMPTY=VM Name cannot be empty. -VM_CANNOT_UPDATE_ILLEGAL_FIELD=Failed updating the properties of the VM. This may be caused either by:\n1. The values selected are not appropriate for the VM; or\n2. Its values cannot be updated while the VM is in UP state (Please shut down the VM in order to modify properties such as CPU or cluster). +VM_CANNOT_UPDATE_ILLEGAL_FIELD=There was an attempt to change VM values while the VM is not down. Please shut down the VM in order to modify these properties. VM_CANNOT_RUN_FROM_NETWORK_WITHOUT_NETWORK=VM is configured to be 'Network bootable', but no Network Interface is configured.\n\ Alternatives:\n\ -Select a different boot device (using the 'Run Once' command or 'Edit VM' command on Boot Option Sub-Tab).\n\ diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 513a6cd..0fb1251 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -24,7 +24,7 @@ VM_TEMPLATE_IMAGE_IS_ILLEGAL=Template's Image is invalid (temporarily). VM_TEMPLATE_IMAGE_LAST_DOMAIN=Template's Image is located only on single domain. VM_NAME_CANNOT_BE_EMPTY=VM Name cannot be empty. -VM_CANNOT_UPDATE_ILLEGAL_FIELD=Failed updating the properties of the VM. This may be caused either by:\n1. The values selected are not appropriate for the VM; or\n2. Its values cannot be updated while the VM is in UP state (Please shut down the VM in order to modify properties such as CPU or cluster). +VM_CANNOT_UPDATE_ILLEGAL_FIELD=There was an attempt to change VM values while the VM is not down. Please shut down the VM in order to modify these properties. VM_CANNOT_RUN_FROM_NETWORK_WITHOUT_NETWORK=VM is configured to be 'Network bootable', but no Network Interface is configured.\n\ Alternatives:\n\ -Select a different boot device (using the 'Run Once' command or 'Edit VM' command on Boot Option Sub-Tab).\n\ -- To view, visit http://gerrit.ovirt.org/17594 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I61c223134bbb3674572c23fa58485e1f500fd368 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Betak <mbe...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
