From 0b69b24e160e55c225cd8dda8cd81f28c49591f1 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Wed, 28 Jul 2021 15:04:10 -0400 Subject: [PATCH] SearchKit - fix deprecated join Fixes dev/core#2689 --- ext/search_kit/ang/crmSearchAdmin.module.js | 4 ++-- ext/search_kit/ang/crmSearchAdmin/searchList.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ext/search_kit/ang/crmSearchAdmin.module.js b/ext/search_kit/ang/crmSearchAdmin.module.js index 0ac61bf896c8..6293e92cec08 100644 --- a/ext/search_kit/ang/crmSearchAdmin.module.js +++ b/ext/search_kit/ang/crmSearchAdmin.module.js @@ -23,8 +23,8 @@ 'label', 'api_entity', 'api_params', - 'created.display_name', - 'modified.display_name', + 'created_id.display_name', + 'modified_id.display_name', 'created_date', 'modified_date', 'GROUP_CONCAT(display.name ORDER BY display.id) AS display_name', diff --git a/ext/search_kit/ang/crmSearchAdmin/searchList.html b/ext/search_kit/ang/crmSearchAdmin/searchList.html index debbbd0d9e78..9d270131632f 100644 --- a/ext/search_kit/ang/crmSearchAdmin/searchList.html +++ b/ext/search_kit/ang/crmSearchAdmin/searchList.html @@ -101,10 +101,10 @@

{{:: ts('Saved Searches') }}

- {{:: search['created.display_name'] ? ts('%1 by %2', {1: formatDate(search.created_date), 2: search['created.display_name']}) : formatDate(search.created_date) }} + {{:: search['created_id.display_name'] ? ts('%1 by %2', {1: formatDate(search.created_date), 2: search['created_id.display_name']}) : formatDate(search.created_date) }} - {{:: search['modified.display_name'] ? ts('%1 by %2', {1: formatDate(search.modified_date), 2: search['modified.display_name']}) : formatDate(search.modified_date) }} + {{:: search['modified_id.display_name'] ? ts('%1 by %2', {1: formatDate(search.modified_date), 2: search['modified_id.display_name']}) : formatDate(search.modified_date) }} {{:: ts('Edit') }}