From 37ecf4d003bf754fd7a563be6e3da78eb8d8fde9 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Wed, 7 Oct 2020 16:48:58 +0200
Subject: [PATCH] FIX #14975 TIME 0:25 disable processLimitDate
---
bin/notification/stack_letterbox_alerts.php | 4 ++--
src/app/resource/controllers/IndexingController.php | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/bin/notification/stack_letterbox_alerts.php b/bin/notification/stack_letterbox_alerts.php
index 372949e0605..c4cb92f7a4d 100644
--- a/bin/notification/stack_letterbox_alerts.php
+++ b/bin/notification/stack_letterbox_alerts.php
@@ -75,7 +75,7 @@ while ($state <> 'END') {
$user = $users[0];
// Alert 1 = limit - n days
- if ($myDoc['flag_alarm1'] != 'Y' && $myDoc['flag_alarm2'] != 'Y') {
+ if ($myDoc['flag_alarm1'] != 'Y' && $myDoc['flag_alarm2'] != 'Y' && $myDoctype['delay1'] > 0) {
$processDate = \Resource\controllers\IndexingController::calculateProcessDate(['date' => $myDoc['process_limit_date'], 'delay' => $myDoctype['delay1'], 'sub' => true]);
if (strtotime($processDate) <= time()) {
Bt_writeLog(['level' => 'INFO', 'message' => "Alarm 1 will be sent"]);
@@ -96,7 +96,7 @@ while ($state <> 'END') {
}
// Alert 2 = limit + n days
- if ($myDoc['flag_alarm2'] != 'Y') {
+ if ($myDoc['flag_alarm2'] != 'Y' && $myDoctype['delay2'] > 0) {
$processDate = \Resource\controllers\IndexingController::calculateProcessDate(['date' => $myDoc['process_limit_date'], 'delay' => $myDoctype['delay2']]);
if (strtotime($processDate) <= time()) {
Bt_writeLog(['level' => 'INFO', 'message' => "Alarm 2 will be sent"]);
diff --git a/src/app/resource/controllers/IndexingController.php b/src/app/resource/controllers/IndexingController.php
index 1d3dd4af728..e67a60c93cf 100755
--- a/src/app/resource/controllers/IndexingController.php
+++ b/src/app/resource/controllers/IndexingController.php
@@ -233,10 +233,13 @@ class IndexingController
if (!empty($queryParams['doctype'])) {
$doctype = DoctypeModel::getById(['id' => $queryParams['doctype'], 'select' => ['process_delay']]);
- $delay = $doctype['process_delay'];
+ $delay = $doctype['process_delay'];
} elseif (!empty($queryParams['priority'])) {
$priority = PriorityModel::getById(['id' => $queryParams['priority'], 'select' => ['delays']]);
- $delay = $priority['delays'];
+ $delay = $priority['delays'];
+ }
+ if ($delay == 0) {
+ return $response->withJson(['processLimitDate' => null]);
}
if (!isset($delay) || !Validator::intVal()->validate($delay)) {
return $response->withStatus(400)->withJson(['errors' => 'Delay is not a numeric value']);
--
GitLab