Michael Kublin has submitted this change and it was merged. Change subject: webadmin: Wrong error message is shown, when SuperUser permissions are removing from admin internal ...................................................................... webadmin: Wrong error message is shown, when SuperUser permissions are removing from admin internal The following bug contains two errors: 1. Fixing error message: Cannot ${action} ${type}. 2. In canDoAction() , if we failed at first condition, no reason to perfrom additional checks Change-Id: I825a379b383fd923046e17e6f1d27c6003c48900 Bug-Url: https://bugzilla.redhat.com/924880 Signed-off-by: Michael Kublin <mkublin@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemovePermissionCommand.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java 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 6 files changed, 15 insertions(+), 4 deletions(-) Approvals: Michael Kublin: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/13353 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I825a379b383fd923046e17e6f1d27c6003c48900 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <mkublin@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Gilad Chaplik <gchaplik@redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin@redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs@redhat.com>