hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-17 06:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'atmire/master' into Browse-by-links

Browse Source 
Conflicts:
	src/app/core/browse/browse.service.spec.ts
	src/app/core/data/dso-response-parsing.service.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2019-02-13 13:25:35 +01:00
parent 49fc891809 34e78bd495
commit 371f2bcd85
194 changed files with 4513 additions and 1751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/core/data/dso-response-parsing.service.ts
View File

@@ -7,7 +7,7 @@ import { NormalizedObject } from '../cache/models/normalized-object.model';
import { ResourceType } from '../shared/resource-type';
import { NormalizedObjectFactory } from '../cache/models/normalized-object-factory';
import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
import { RestResponse, DSOSuccessResponse } from '../cache/response-cache.models';
import { RestResponse, DSOSuccessResponse } from '../cache/response.models';
import { RestRequest } from './request.models';
import { ResponseParsingService } from './parsing.service';
@@ -23,7 +23,8 @@ export class DSOResponseParsingService extends BaseResponseParsingService implem
constructor(
@Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig,
protected objectCache: ObjectCacheService,
) { super();
) {
super();
}
parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
@@ -32,9 +33,10 @@ export class DSOResponseParsingService extends BaseResponseParsingService implem
if (hasValue(data.payload) && hasValue(data.payload.page) && data.payload.page.totalElements === 0) {
processRequestDTO = { page: [] };
} else {
processRequestDTO = this.process<NormalizedObject, ResourceType>(data.payload, request.href);
processRequestDTO = this.process<NormalizedObject, ResourceType>(data.payload, request.uuid);
}
let objectList = processRequestDTO;
if (hasNoValue(processRequestDTO)) {
return new DSOSuccessResponse([], data.statusCode, undefined)
}