From 5f863fa3429a04a4c710b0f0c3350c6fdc78f7a7 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Mon, 13 Sep 2021 20:16:44 -0700 Subject: [PATCH] msgtplui - Edit.js, Preview.js - Use updated ExampleData API --- ext/msgtplui/ang/msgtplui/Edit.js | 4 ++-- ext/msgtplui/ang/msgtplui/Preview.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/msgtplui/ang/msgtplui/Edit.js b/ext/msgtplui/ang/msgtplui/Edit.js index 8c05b60193..bbfd06a752 100644 --- a/ext/msgtplui/ang/msgtplui/Edit.js +++ b/ext/msgtplui/ang/msgtplui/Edit.js @@ -268,8 +268,8 @@ crmApi4({ examples: ['ExampleData', 'get', { // FIXME: workflow name - where: [["tags", "CONTAINS", "preview"], ["workflow", "=", $ctrl.records.main.workflow_name]], - select: ['name', 'title', 'workflow', 'data'] + where: [["tags", "CONTAINS", "preview"], ["name", "LIKE", "workflow/" + $ctrl.records.main.workflow_name + "/%"]], + select: ['name', 'title', 'data'] }], adhoc: ['WorkflowMessage', 'getTemplateFields', { workflow: $ctrl.records.main.workflow_name, diff --git a/ext/msgtplui/ang/msgtplui/Preview.js b/ext/msgtplui/ang/msgtplui/Preview.js index 7cac7653b5..4c68cd5593 100644 --- a/ext/msgtplui/ang/msgtplui/Preview.js +++ b/ext/msgtplui/ang/msgtplui/Preview.js @@ -29,7 +29,7 @@ return $q.reject(ts('Malformed JSON example')); } return crmApi4('WorkflowMessage', 'render', { - workflow: adhocExample.workflow, + workflow: adhocExample.data.workflow, values: adhocExample.data.modelProps, messageTemplate: model.revisions[$ctrl.revisionId].rec }).then(function(response) { @@ -41,10 +41,10 @@ // For a dev working on example, it's easier if the example is always loaded fresh. return crmApi4('ExampleData', 'get', { where: [["name", "=", model.examples[$ctrl.exampleId].name]], - select: ['workflow', 'data'], + select: ['data'], chain: { "render": ["WorkflowMessage", "render", { - "workflow": "$workflow", + "workflow": "$data.workflow", "values": "$data.modelProps", "messageTemplate": model.revisions[$ctrl.revisionId].rec }] -- 2.25.1