Tomas Jelinek has submitted this change and it was merged. Change subject: userportal: Only assignable roles shown on VM/Template permission tab ...................................................................... userportal: Only assignable roles shown on VM/Template permission tab In userportal: The "Role to Assign" drop down list on VM/Template Permission Popup View shows: - only non-admin roles when logged as a standard user - all roles (admin+user) when logged as an admin The corresponding list in the webadmin shows all roles (since the logged user is an admin). The roles are filtered on business layer. Change-Id: Iad85c4a242e196c7fa3a0fef4d18bdf96a36bbd2 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1273025 Signed-off-by: Marek Libra <mlibra@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetAllRolesQuery.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AbstractQueryTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/GetAllRolesQueryTest.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDao.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/RoleDaoImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/RoleDaoTest.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/view/popup/permissions/AbstractPermissionsPopupView.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/users/AdElementListModel.java M packaging/dbscripts/multi_level_administration_sp.sql 9 files changed, 58 insertions(+), 5 deletions(-) Approvals: Eli Mesika: Looks good to me, but someone else must approve Jenkins CI: Passed CI tests Marek Libra: Verified Arik Hadas: Looks good to me, approved -- To view, visit https://gerrit.ovirt.org/47779 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad85c4a242e196c7fa3a0fef4d18bdf96a36bbd2 Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Marek Libra <mlibra@redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Marek Libra <mlibra@redhat.com> Gerrit-Reviewer: Shmuel Leib Melamud <smelamud@redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek@redhat.com> Gerrit-Reviewer: automation@ovirt.org