Tal Nisan 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@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: Tomas Jelinek: Looks good to me, approved Tal Nisan: Passed CI tests Jakub Niedermertl: Verified -- To view, visit https://gerrit.ovirt.org/50463 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I72014b20cbe85b2a792cd9e8a53b4b65c641cf59 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Jakub Niedermertl <jniederm@redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Jakub Niedermertl <jniederm@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>