From 638a5032d09b33d677aad3dbd4fec7c0271b4c98 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 23 Dec 2019 16:02:07 +0100
Subject: [PATCH] FEAT #12091 TIME 0:15 Fix _today daye
---
.../controllers/IndexingModelController.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/app/indexingModel/controllers/IndexingModelController.php b/src/app/indexingModel/controllers/IndexingModelController.php
index 57ac2713531..1b68a9eeb77 100644
--- a/src/app/indexingModel/controllers/IndexingModelController.php
+++ b/src/app/indexingModel/controllers/IndexingModelController.php
@@ -179,11 +179,11 @@ class IndexingModelController
]);
foreach ($body['fields'] as $field) {
- if (in_array($field['identifier'], IndexingModelController::INDEXABLE_DATES) && !empty($field['default_value'])) {
+ if (in_array($field['identifier'], IndexingModelController::INDEXABLE_DATES) && !empty($field['default_value']) && $field['default_value'] != '_TODAY') {
$date = new \DateTime($field['default_value']);
$field['default_value'] = $date->format('Y-m-d');
}
- if (strpos($field['identifier'], 'indexingCustomField_') !== false && !empty($field['default_value'])) {
+ if (strpos($field['identifier'], 'indexingCustomField_') !== false && !empty($field['default_value']) && $field['default_value'] != '_TODAY') {
$customFieldId = explode('_', $field['identifier'])[1];
$customField = CustomFieldModel::getById(['id' => $customFieldId, 'select' => ['type']]);
if ($customField['type'] == 'date') {
@@ -303,11 +303,11 @@ class IndexingModelController
IndexingModelFieldModel::delete(['where' => ['model_id = ?'], 'data' => [$child['id']]]);
foreach ($fieldsToKeep as $field) {
- if (in_array($field['identifier'], IndexingModelController::INDEXABLE_DATES) && !empty($field['default_value'])) {
+ if (in_array($field['identifier'], IndexingModelController::INDEXABLE_DATES) && !empty($field['default_value']) && $field['default_value'] != '_TODAY') {
$date = new \DateTime($field['default_value']);
$field['default_value'] = $date->format('Y-m-d');
}
- if (strpos($field['identifier'], 'indexingCustomField_') !== false && !empty($field['default_value'])) {
+ if (strpos($field['identifier'], 'indexingCustomField_') !== false && !empty($field['default_value']) && $field['default_value'] != '_TODAY') {
$customFieldId = explode('_', $field['identifier'])[1];
$customField = CustomFieldModel::getById(['id' => $customFieldId, 'select' => ['type']]);
if ($customField['type'] == 'date') {
@@ -338,11 +338,11 @@ class IndexingModelController
IndexingModelFieldModel::delete(['where' => ['model_id = ?'], 'data' => [$args['id']]]);
foreach ($body['fields'] as $field) {
- if (in_array($field['identifier'], IndexingModelController::INDEXABLE_DATES) && !empty($field['default_value'])) {
+ if (in_array($field['identifier'], IndexingModelController::INDEXABLE_DATES) && !empty($field['default_value']) && $field['default_value'] != '_TODAY') {
$date = new \DateTime($field['default_value']);
$field['default_value'] = $date->format('Y-m-d');
}
- if (strpos($field['identifier'], 'indexingCustomField_') !== false && !empty($field['default_value'])) {
+ if (strpos($field['identifier'], 'indexingCustomField_') !== false && !empty($field['default_value']) && $field['default_value'] != '_TODAY') {
$customFieldId = explode('_', $field['identifier'])[1];
$customField = CustomFieldModel::getById(['id' => $customFieldId, 'select' => ['type']]);
if ($customField['type'] == 'date') {
--
GitLab