Tomas Jelinek has uploaded a new change for review. Change subject: webadmin: add next run configuration for pooled vms ......................................................................
webadmin: add next run configuration for pooled vms If the pool is based on an instance type and the instance type changes, the vms in this pool changes as well. If such a VM is running, the "next run" icon has to be shown next to the VM type icon. This has already been working on not-pooled vms and in user portal - this adds the last missine part which is the pooled vms in web admin. Change-Id: Iaf53f83111a84065cf734612541a6144d90fc3ef Bug-Url: https://bugzilla.redhat.com/1176937 Signed-off-by: Tomas Jelinek <tjeli...@redhat.com> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java A frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/many_desktops_changes.png 3 files changed, 9 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/36625/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java index 848d8cd..ca194d2 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationResources.java @@ -106,6 +106,9 @@ @Source("images/many_desktops.png") ImageResource manyDesktopsImage(); + @Source("images/many_desktops_changes.png") + ImageResource manyDesktopsChangesImage(); + @Source("images/minus.png") ImageResource minusImage(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java index 9ecbc7d..daf40ce 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/VmTypeColumn.java @@ -21,7 +21,12 @@ setTitle(config.getTooltip(constants)); return config.getImageResource(getApplicationResources()); } else { - return getApplicationResources().manyDesktopsImage(); + if (!vm.isNextRunConfigurationExists()) { + return getApplicationResources().manyDesktopsImage(); + } else { + return getApplicationResources().manyDesktopsChangesImage(); + } + } } diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/many_desktops_changes.png b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/many_desktops_changes.png new file mode 100644 index 0000000..0fc1efc --- /dev/null +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/webadmin/images/many_desktops_changes.png Binary files differ -- To view, visit http://gerrit.ovirt.org/36625 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf53f83111a84065cf734612541a6144d90fc3ef Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
