Ori Liel has uploaded a new change for review. Change subject: resatpi: Wrong Links In Group (#967547) ......................................................................
resatpi: Wrong Links In Group (#967547) Links to tags, permissions, roles within Group included domain: wrong: .../api/domain/xxx/group/yyy/tags (404 not found) after fix: .../api/groups/yyy/tags (good) Bug-Url: http://bugzilla.redhat.com/967547 Change-Id: I1106470e0a6dbbf804f949f2d0959ef914717bde Signed-off-by: Ori Liel <[email protected]> --- M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java 2 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/15/15515/1 diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupResource.java index 425063b..91eac74 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupResource.java @@ -2,6 +2,7 @@ import static org.ovirt.engine.api.restapi.resource.BackendGroupsResourceBase.SUB_COLLECTIONS; +import org.ovirt.engine.api.model.BaseResource; import org.ovirt.engine.api.model.Group; import org.ovirt.engine.api.resource.AssignedPermissionsResource; import org.ovirt.engine.api.resource.AssignedRolesResource; @@ -25,7 +26,7 @@ @Override public Group get() { - return performGet(VdcQueryType.GetAdGroupById, new IdQueryParameters(guid)); + return performGet(VdcQueryType.GetAdGroupById, new IdQueryParameters(guid), BaseResource.class); } @Override diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java index c73e177..9c001c3 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendGroupsResourceBase.java @@ -11,6 +11,7 @@ import org.apache.commons.lang.StringUtils; import org.ovirt.engine.api.common.security.auth.Principal; import org.ovirt.engine.api.common.util.QueryHelper; +import org.ovirt.engine.api.model.BaseResource; import org.ovirt.engine.api.model.Group; import org.ovirt.engine.api.model.Groups; import org.ovirt.engine.api.model.User; @@ -72,7 +73,7 @@ protected Groups mapDbGroupsCollection(List<DbUser> entities) { Groups collection = new Groups(); for (DbUser entity : entities) { - collection.getGroups().add(addLinks(modifyDomain(mapDbUser(entity)))); + collection.getGroups().add(addLinks(modifyDomain(mapDbUser(entity)), BaseResource.class)); } return collection; } -- To view, visit http://gerrit.ovirt.org/15515 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1106470e0a6dbbf804f949f2d0959ef914717bde Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ori Liel <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
