From 5c2b7767ed43a56f740bdec15539a5804bad0b84 Mon Sep 17 00:00:00 2001
From: Michael W Spalti <mspalti@gmail.com>
Date: Sun, 22 Sep 2019 21:51:04 -0700
Subject: [PATCH] Renamed cache property and replaced conditional with
hasValue.
---
src/app/core/data/data.service.ts | 1 -
src/app/core/tasks/claimed-task-data.service.ts | 4 ++++
src/app/core/tasks/pool-task-data.service.ts | 4 ++++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
index dbe98ddf89..8362358d61 100644
--- a/src/app/core/data/data.service.ts
+++ b/src/app/core/data/data.service.ts
@@ -171,7 +171,6 @@ export abstract class DataService<T extends CacheableObject> {
findByHref(href: string, options?: HttpOptions): Observable<RemoteData<T>> {
const request = new GetRequest(this.requestService.generateRequestId(), href, null, options);
-
if (hasValue(this.responseMsToLive)) {
request.responseMsToLive = this.responseMsToLive;
}
diff --git a/src/app/core/tasks/claimed-task-data.service.ts b/src/app/core/tasks/claimed-task-data.service.ts
index 31d6448a1a..6341c2713a 100644
--- a/src/app/core/tasks/claimed-task-data.service.ts
+++ b/src/app/core/tasks/claimed-task-data.service.ts
@@ -22,6 +22,7 @@ import { ProcessTaskResponse } from './models/process-task-response';
@Injectable()
export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
+<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
protected responseMsToLive = 0;
@@ -31,6 +32,9 @@ export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
=======
protected resetMsToLive = 0;
>>>>>>> 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
diff --git a/src/app/core/tasks/pool-task-data.service.ts b/src/app/core/tasks/pool-task-data.service.ts
index 77fff02618..f763abb1cc 100644
--- a/src/app/core/tasks/pool-task-data.service.ts
+++ b/src/app/core/tasks/pool-task-data.service.ts
@@ -29,6 +29,7 @@ export class PoolTaskDataService extends TasksService<PoolTask> {
<<<<<<< HEAD
<<<<<<< HEAD
+<<<<<<< HEAD
<<<<<<< HEAD
protected responseMsToLive = 0;
@@ -39,6 +40,9 @@ export class PoolTaskDataService extends TasksService<PoolTask> {
=======
protected resetMsToLive = 0;
>>>>>>> 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.
/**
--
GitLab