Skip to content
Snippets Groups Projects
Verified Commit 638a5032 authored by Damien's avatar Damien
Browse files

FEAT #12091 TIME 0:15 Fix _today daye

parent ae294181
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/app/indexingModel/controllers/IndexingModelController.php
+ 6
− 6
View file @ 638a5032
...@@ -179,11 +179,11 @@ class IndexingModelController ...@@ -179,11 +179,11 @@ class IndexingModelController
]); ]);
foreach ($body['fields'] as $field) { 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']); $date = new \DateTime($field['default_value']);
$field['default_value'] = $date->format('Y-m-d'); $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]; $customFieldId = explode('_', $field['identifier'])[1];
$customField = CustomFieldModel::getById(['id' => $customFieldId, 'select' => ['type']]); $customField = CustomFieldModel::getById(['id' => $customFieldId, 'select' => ['type']]);
if ($customField['type'] == 'date') { if ($customField['type'] == 'date') {
...@@ -303,11 +303,11 @@ class IndexingModelController ...@@ -303,11 +303,11 @@ class IndexingModelController
IndexingModelFieldModel::delete(['where' => ['model_id = ?'], 'data' => [$child['id']]]); IndexingModelFieldModel::delete(['where' => ['model_id = ?'], 'data' => [$child['id']]]);
foreach ($fieldsToKeep as $field) { 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']); $date = new \DateTime($field['default_value']);
$field['default_value'] = $date->format('Y-m-d'); $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]; $customFieldId = explode('_', $field['identifier'])[1];
$customField = CustomFieldModel::getById(['id' => $customFieldId, 'select' => ['type']]); $customField = CustomFieldModel::getById(['id' => $customFieldId, 'select' => ['type']]);
if ($customField['type'] == 'date') { if ($customField['type'] == 'date') {
...@@ -338,11 +338,11 @@ class IndexingModelController ...@@ -338,11 +338,11 @@ class IndexingModelController
IndexingModelFieldModel::delete(['where' => ['model_id = ?'], 'data' => [$args['id']]]); IndexingModelFieldModel::delete(['where' => ['model_id = ?'], 'data' => [$args['id']]]);
foreach ($body['fields'] as $field) { 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']); $date = new \DateTime($field['default_value']);
$field['default_value'] = $date->format('Y-m-d'); $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]; $customFieldId = explode('_', $field['identifier'])[1];
$customField = CustomFieldModel::getById(['id' => $customFieldId, 'select' => ['type']]); $customField = CustomFieldModel::getById(['id' => $customFieldId, 'select' => ['type']]);
if ($customField['type'] == 'date') { if ($customField['type'] == 'date') {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment