Asaf Shakarchi has uploaded a new change for review.
Change subject: engine: Fixed message when trying to move a locked disk.
......................................................................
engine: Fixed message when trying to move a locked disk.
When trying to move a locked disk, the following message was displayed:
"Error while executing action: Cannot move Virtual Machine Disk: The
disks ${diskAliases} are locked. Please try again in a few minutes."
Fixed message grammar for a single disk, disk name macro is replaced
with disk alias now.
Change-Id: I808005143d9be5a08bf05e2a0c7748a0f14df4aa
Bug-Url: https://bugzilla.redhat.com/874099
Signed-off-by: Asaf Shakarchi <a...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/9279/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
index a75d06a..7f6f51c 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
@@ -103,7 +103,8 @@
protected boolean isImageIsNotLocked() {
if (getImage().getimageStatus() == ImageStatus.LOCKED) {
if (getParameters().getOperation() == ImageOperation.Move) {
-
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISKS_ARE_LOCKED);
+
addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_DISK_IS_LOCKED);
+ addCanDoActionMessage(String.format("$%1$s %2$s", "diskAlias",
getImage().getDiskAlias()));
} else {
addCanDoActionMessage(VdcBllMessages.VM_TEMPLATE_IMAGE_IS_LOCKED);
}
--
To view, visit http://gerrit.ovirt.org/9279
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I808005143d9be5a08bf05e2a0c7748a0f14df4aa
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Asaf Shakarchi <a...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
