From d2c77bf9ec9635633666f6ccdba67347f59209df Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 8 Oct 2021 14:27:42 -0700 Subject: [PATCH] message_admin - When using "Preview", use the 'locale' from the editing UI --- ext/message_admin/ang/crmMsgadm/Edit.js | 6 +++++- ext/message_admin/ang/crmMsgadm/Preview.js | 10 +++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ext/message_admin/ang/crmMsgadm/Edit.js b/ext/message_admin/ang/crmMsgadm/Edit.js index 1f60b61015..0a3f3dd340 100644 --- a/ext/message_admin/ang/crmMsgadm/Edit.js +++ b/ext/message_admin/ang/crmMsgadm/Edit.js @@ -257,7 +257,11 @@ } return acc; }, []), - title: ts('Preview') + filterData: function(data) { + data.modelProps.locale = $ctrl.lang; + return data; + }, + title: $ctrl.lang ? ts('Preview - %1', {1: $ctrl.locales[$ctrl.lang] || $ctrl.lang}) : ts('Preview') }; crmApi4({ diff --git a/ext/message_admin/ang/crmMsgadm/Preview.js b/ext/message_admin/ang/crmMsgadm/Preview.js index 11bb3d8a7c..82b994c27d 100644 --- a/ext/message_admin/ang/crmMsgadm/Preview.js +++ b/ext/message_admin/ang/crmMsgadm/Preview.js @@ -39,6 +39,9 @@ }).then(function(response){ dlgModel.title = ts('Example: %1', {1: response[0].title || response[0].name}); dlgModel.data = response[0]; + if (model.filterData && dlgModel.data.data) { + dlgModel.data['data(filtered)'] = model.filterData(angular.copy(dlgModel.data.data)); + } }); }; @@ -76,10 +79,11 @@ // $ctrl.preview = model.revisions[$ctrl.revisionId].rec; $ctrl.preview = {loading: true}; var rendering = $ctrl.isAdhocExample ? requestAdhocExample() : requestStoredExample(); - rendering.then(function(exampleData){ + rendering.then(function(exampleData) { + var filteredData = model.filterData ? model.filterData(exampleData) : exampleData; return crmApi4('WorkflowMessage', 'render', { - workflow: exampleData.workflow, - values: exampleData.modelProps, + workflow: filteredData.workflow, + values: filteredData.modelProps, messageTemplate: model.revisions[$ctrl.revisionId].rec }); }).then(function(response) { -- 2.25.1