Change in ovirt-engine[master]: core: Fix of repetitive setting same custom icon

[tjelinek at redhat.com]

Tomas Jelinek has submitted this change and it was merged.

Change subject: core: Fix of repetitive setting same custom icon
......................................................................


core: Fix of repetitive setting same custom icon

Following scenario was previously failing:
 - use new custom icon (e.g. edit vm)
 - remove usage of custom icon (e.g. use default icon for vm)
 - upload the same custom icon again (e.g. edit vm)

The cause was that icon ids in parameters were sent from frontend
(because the icon was stored in frontend cache) but the ids were not
valid (icon was removed from db in second step).

This patch fixes it by ignoring icon ids in parameters by canDoAction
validation if actual icon is uploaded.

Change-Id: I72014b20cbe85b2a792cd9e8a53b4b65c641cf59
Bug-Url: https://bugzilla.redhat.com/1267711
Signed-off-by: Jakub Niedermertl <jniederm at redhat.com>
---
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVmTemplateCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmCommand.java
M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java
4 files changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Jakub Niedermertl: Verified
  Jenkins CI: Passed CI tests
  Marek Libra: Looks good to me, but someone else must approve
  Arik Hadas: Looks good to me, approved



-- 
To view, visit https://gerrit.ovirt.org/49533
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I72014b20cbe85b2a792cd9e8a53b4b65c641cf59
Gerrit-PatchSet: 7
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Jakub Niedermertl <jniederm at redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas at redhat.com>
Gerrit-Reviewer: Jakub Niedermertl <jniederm at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Marek Libra <mlibra at redhat.com>
Gerrit-Reviewer: Martin Sivák <msivak at redhat.com>
Gerrit-Reviewer: Tomas Jelinek <tjelinek at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>