hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly checking for undefined in dataService (since I think 0 is not truthy for number).

Browse Source
This commit is contained in:
Michael W Spalti
2019-09-16 12:13:24 -07:00
parent 934f5a1bd0
commit 2d9fdef974
1 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/core/data/data.service.ts
View File

@@ -52,11 +52,7 @@ export abstract class DataService<T extends CacheableObject> {
/** /**
* Allows subclasses to reset the response cache time. * Allows subclasses to reset the response cache time.
*/ */
<<<<<<< HEAD
protected responseMsToLive: number; protected responseMsToLive: number;
=======
protected resetMsToLive: number;
>>>>>>> Sets responseMsToLive to zero in some dataService methods and adds ability to reset the responseMsToLive value in subclasses.
public abstract getBrowseEndpoint(options: FindAllOptions, linkPath?: string): Observable<string> public abstract getBrowseEndpoint(options: FindAllOptions, linkPath?: string): Observable<string>
@@ -138,13 +134,8 @@ export abstract class DataService<T extends CacheableObject> {
first((href: string) => hasValue(href))) first((href: string) => hasValue(href)))
.subscribe((href: string) => { .subscribe((href: string) => {
const request = new FindAllRequest(this.requestService.generateRequestId(), href, options); const request = new FindAllRequest(this.requestService.generateRequestId(), href, options);
<<<<<<< HEAD
if (hasValue(this.responseMsToLive)) { if (hasValue(this.responseMsToLive)) {
request.responseMsToLive = this.responseMsToLive; request.responseMsToLive = this.responseMsToLive;
=======
if (this.resetMsToLive) {
request.responseMsToLive = this.resetMsToLive;
>>>>>>> Sets responseMsToLive to zero in some dataService methods and adds ability to reset the responseMsToLive value in subclasses.
} }
this.requestService.configure(request); this.requestService.configure(request);
}); });
@@ -169,13 +160,8 @@ export abstract class DataService<T extends CacheableObject> {
find((href: string) => hasValue(href))) find((href: string) => hasValue(href)))
.subscribe((href: string) => { .subscribe((href: string) => {
const request = new FindByIDRequest(this.requestService.generateRequestId(), href, id); const request = new FindByIDRequest(this.requestService.generateRequestId(), href, id);
<<<<<<< HEAD
if (hasValue(this.responseMsToLive)) { if (hasValue(this.responseMsToLive)) {
request.responseMsToLive = this.responseMsToLive; request.responseMsToLive = this.responseMsToLive;
=======
if (this.resetMsToLive) {
request.responseMsToLive = this.resetMsToLive;
>>>>>>> Sets responseMsToLive to zero in some dataService methods and adds ability to reset the responseMsToLive value in subclasses.
} }
this.requestService.configure(request); this.requestService.configure(request);
}); });
@@ -185,13 +171,9 @@ export abstract class DataService<T extends CacheableObject> {
findByHref(href: string, options?: HttpOptions): Observable<RemoteData<T>> { findByHref(href: string, options?: HttpOptions): Observable<RemoteData<T>> {
const request = new GetRequest(this.requestService.generateRequestId(), href, null, options); const request = new GetRequest(this.requestService.generateRequestId(), href, null, options);
<<<<<<< HEAD
if (hasValue(this.responseMsToLive)) { if (hasValue(this.responseMsToLive)) {
request.responseMsToLive = this.responseMsToLive; request.responseMsToLive = this.responseMsToLive;
=======
if (this.resetMsToLive) {
request.responseMsToLive = this.resetMsToLive;
>>>>>>> Sets responseMsToLive to zero in some dataService methods and adds ability to reset the responseMsToLive value in subclasses.
} }
this.requestService.configure(request); this.requestService.configure(request);
return this.rdbService.buildSingle<T>(href); return this.rdbService.buildSingle<T>(href);