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

Renamed cache property and replaced conditional with hasValue.

Browse Source
This commit is contained in:
Michael W Spalti
2019-09-22 21:51:04 -07:00
parent 2d9fdef974
commit 5c2b7767ed
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,7 +171,6 @@ 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);
if (hasValue(this.responseMsToLive)) { if (hasValue(this.responseMsToLive)) {
request.responseMsToLive = this.responseMsToLive; request.responseMsToLive = this.responseMsToLive;
} }

4
src/app/core/tasks/claimed-task-data.service.ts
View File

@@ -22,6 +22,7 @@ import { ProcessTaskResponse } from './models/process-task-response';
@Injectable() @Injectable()
export class ClaimedTaskDataService extends TasksService<ClaimedTask> { export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
protected responseMsToLive = 0; protected responseMsToLive = 0;
@@ -31,6 +32,9 @@ export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
======= =======
protected resetMsToLive = 0; protected resetMsToLive = 0;
>>>>>>> Sets responseMsToLive to zero in some dataService methods and adds ability to reset the responseMsToLive value in subclasses. >>>>>>> Sets responseMsToLive to zero in some dataService methods and adds ability to reset the responseMsToLive value in subclasses.
=======
protected responseMsToLive = 0;
>>>>>>> Renamed cache property and replaced conditional with hasValue.
/** /**
* The endpoint link name * The endpoint link name

4
src/app/core/tasks/pool-task-data.service.ts
View File

@@ -29,6 +29,7 @@ export class PoolTaskDataService extends TasksService<PoolTask> {
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
protected responseMsToLive = 0; protected responseMsToLive = 0;
@@ -39,6 +40,9 @@ export class PoolTaskDataService extends TasksService<PoolTask> {
======= =======
protected resetMsToLive = 0; protected resetMsToLive = 0;
>>>>>>> Sets responseMsToLive to zero in some dataService methods and adds ability to reset the responseMsToLive value in subclasses. >>>>>>> Sets responseMsToLive to zero in some dataService methods and adds ability to reset the responseMsToLive value in subclasses.
=======
protected responseMsToLive = 0;
>>>>>>> Renamed cache property and replaced conditional with hasValue.
>>>>>>> Setting cache period to zero for all instances where forceBypassCache was previously true. >>>>>>> Setting cache period to zero for all instances where forceBypassCache was previously true.
/** /**