From d3559360e256866377908a86ff74eb427bf20243 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Wed, 20 May 2020 15:28:16 +0200
Subject: [PATCH] FEAT #8939 TIME 0:20 Do not update closing_date if not null
---
src/app/resource/controllers/ResController.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php
index 1947ac8b60f..e7bc9dbc650 100755
--- a/src/app/resource/controllers/ResController.php
+++ b/src/app/resource/controllers/ResController.php
@@ -386,8 +386,12 @@ class ResController extends ResourceControlController
return $response->withStatus(403)->withJson(['errors' => 'Document out of perimeter']);
}
- ResModel::update(['set' => ['status' => $data['status'], 'closing_date' => $closingDate], 'where' => ['res_id = ?'], 'data' => [$document['res_id']]]);
-
+ if ($closingDate == null) {
+ ResModel::update(['set' => ['status' => $data['status'], 'closing_date' => $closingDate], 'where' => ['res_id = ?'], 'data' => [$document['res_id']]]);
+ } else {
+ ResModel::update(['set' => ['status' => $data['status'], 'closing_date' => $closingDate], 'where' => ['res_id = ?', 'closing_date is null'], 'data' => [$document['res_id']]]);
+ }
+
HistoryController::add([
'tableName' => 'res_letterbox',
'recordId' => $document['res_id'],
--
GitLab