Ravi Nori has uploaded a new change for review. Change subject: restapi : Error when adding/removing permissions with filtered api(#919686) ......................................................................
restapi : Error when adding/removing permissions with filtered api(#919686) Internal server error when UserVmManager adds a User role permission on a VM, the permission gets added. Insufficent privileges error when removing the permission which was added. Change-Id: I47cbb6e06599fc64afcb491bef15b46a82afd681 Bug-Url: https://bugzilla.redhat.com/919686 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java 2 files changed, 9 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/13022/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java index 1a8f1d1..08657d6 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java @@ -193,7 +193,7 @@ GetRolesByAdElementIdAndNullTag, GetRoleById(VdcQueryAuthType.User), GetRoleByName, - GetPermissionById, + GetPermissionById(VdcQueryAuthType.User), GetPermissionByRoleId, GetPermissionsByAdElement, HasAdElementReconnectPermission(VdcQueryAuthType.User), diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java index d838cd2..fd8d5e1 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java @@ -154,12 +154,19 @@ public Map<Guid, DbUser> getUsers() { HashMap<Guid, DbUser> users = new HashMap<Guid, DbUser>(); - for (DbUser user : asCollection(DbUser.class, getEntity(List.class, SearchType.DBUser, "users:"))) { + for (DbUser user : lookupUsers()) { users.put(user.getuser_id(), user); } return users; } + private List<DbUser> lookupUsers() { + if (isFiltered()) { + return getBackendCollection(DbUser.class, VdcQueryType.GetAllDbUsers, new VdcQueryParametersBase()); + } + return asCollection(DbUser.class, getEntity(List.class, SearchType.DBUser, "users:")); + } + /** * injects user/group base on permission owner type * @param entity the permission to map -- To view, visit http://gerrit.ovirt.org/13022 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47cbb6e06599fc64afcb491bef15b46a82afd681 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
