From 40f6184e65ecf6b092b88c5644f5831d87f8a358 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 3 May 2022 20:49:56 -0400 Subject: [PATCH] SearchKit - Consistently check for date field --- .../crmSearchInput/crmSearchInputVal.component.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInputVal.component.js b/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInputVal.component.js index 6d54653605..a249019898 100644 --- a/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInputVal.component.js +++ b/ext/search_kit/ang/crmSearchTasks/crmSearchInput/crmSearchInputVal.component.js @@ -21,7 +21,7 @@ this.ngModel.$render = function() { ctrl.value = ctrl.ngModel.$viewValue; - if (!rendered && field.input_type === 'Date') { + if (!rendered && isDateField(field)) { setDateType(); } rendered = true; @@ -102,7 +102,7 @@ return '~/crmSearchTasks/crmSearchInput/text.html'; } - if (field.data_type === 'Date' || field.data_type === 'Timestamp') { + if (isDateField(field)) { return '~/crmSearchTasks/crmSearchInput/date.html'; } @@ -134,6 +134,10 @@ return {results: formatForSelect2(field.options || [], ctrl.optionKey || 'id', 'label', ['description', 'color', 'icon'])}; }; + function isDateField(field) { + return field.data_type === 'Date' || field.data_type === 'Timestamp'; + } + } }); -- 2.25.1