From ffca28dd1d47ea93b39c32a8b2b290318a1d9560 Mon Sep 17 00:00:00 2001 From: ralf Date: Sat, 4 May 2024 08:10:36 +0200 Subject: [PATCH] fix one more case (empty AB and PM lists) after performance fix for custom fields --- api/js/etemplate/et2_extension_customfields.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/js/etemplate/et2_extension_customfields.ts b/api/js/etemplate/et2_extension_customfields.ts index 2a8bc86c15..5ed9bfc76c 100644 --- a/api/js/etemplate/et2_extension_customfields.ts +++ b/api/js/etemplate/et2_extension_customfields.ts @@ -454,7 +454,7 @@ export class et2_customfields_list extends et2_valueWidget implements et2_IDetac for(let key in data) { // Don't overwrite fields / customfields with global values - if (global_data[key] && key !== 'fields' && (key !== "customfields" || !Object.keys(data.customfields).length)) + if (global_data[key] && key !== 'fields' && (key !== "customfields" || !data.customfields || !Object.keys(data.customfields).length)) { data[key] = {...data[key], ...global_data[key]}; }