Ravi Nori has uploaded a new change for review. Change subject: restapi: wrong user id in /api/users/<id>/permissions(#890124) ......................................................................
restapi: wrong user id in /api/users/<id>/permissions(#890124) The user id returned by /api/users/<id>/permissions shows the everyone id 'eee00000-0000-0000-0000-123456789eee' where it should how the user id. This patch replaces the everyone id with the user id before returning th eresults. Change-Id: I3d801cb3c4ad788e984c5338a04ac534d4942601 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=890124 Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendAssignedPermissionsResource.java 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/81/10581/1 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 89629d5..cec237a 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 @@ -27,6 +27,7 @@ import org.ovirt.engine.core.common.queries.VdcQueryReturnValue; import org.ovirt.engine.core.common.queries.VdcQueryType; import org.ovirt.engine.core.common.queries.GetDbUserByUserIdParameters; +import org.ovirt.engine.core.common.queries.MultilevelAdministrationByAdElementIdParameters; import org.ovirt.engine.core.common.users.VdcUser; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.compat.StringHelper; @@ -94,6 +95,7 @@ Permissions collection = new Permissions(); for (permissions entity : entities) { if (entity.getObjectType() != VdcObjectType.System) { + castEveryonePermissionsToUser(entity); Permission permission = map(entity, getUserById(entity.getad_element_id())); collection.getPermissions().add(addLinks(permission, permission.getUser() != null ? suggestedParentType : Group.class)); } @@ -101,6 +103,14 @@ return collection; } + private void castEveryonePermissionsToUser(permissions entity) { + if (entity.getad_element_id() != null && + entity.getad_element_id().equals(Guid.EVERYONE) && + queryType.equals(VdcQueryType.GetPermissionsByAdElementId)) { + entity.setad_element_id(((MultilevelAdministrationByAdElementIdParameters) queryParams).getAdElementId()); + } + } + public DbUser getUserById(Guid userId) { GetDbUserByUserIdParameters queryParameters = new GetDbUserByUserIdParameters(userId); VdcQueryReturnValue userQueryResponse = runQuery(VdcQueryType.GetDbUserByUserId, queryParameters); -- To view, visit http://gerrit.ovirt.org/10581 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3d801cb3c4ad788e984c5338a04ac534d4942601 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
