From 1c30a11659aa99bd76105173f219aaf232a98e3d Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 1 Oct 2021 19:18:00 -0700
Subject: [PATCH] crmMsgadmEditContent - Extract parameter 'msgtpl'. Fix
 "Create Draft" quirk.

---
 ext/message_admin/ang/crmMsgadm/Edit.html        | 2 +-
 ext/message_admin/ang/crmMsgadm/EditContent.html | 6 +++---
 ext/message_admin/ang/crmMsgadm/EditContent.js   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ext/message_admin/ang/crmMsgadm/Edit.html b/ext/message_admin/ang/crmMsgadm/Edit.html
index 378223c2db..2505450037 100644
--- a/ext/message_admin/ang/crmMsgadm/Edit.html
+++ b/ext/message_admin/ang/crmMsgadm/Edit.html
@@ -67,7 +67,7 @@
         </ul>
       </div>
       <div class="panel-body" ng-hide="$ctrl.loading">
-        <crm-msgadm-edit-content options="{record: $ctrl.records[$ctrl.tab]}" token-list="$ctrl.tokenList" disabled="$ctrl.tab==='original'"></crm-msgadm-edit-content>
+        <crm-msgadm-edit-content msgtpl="$ctrl.records[$ctrl.tab]" token-list="$ctrl.tokenList" disabled="$ctrl.tab==='original'"></crm-msgadm-edit-content>
       </div>
     </div>
 
diff --git a/ext/message_admin/ang/crmMsgadm/EditContent.html b/ext/message_admin/ang/crmMsgadm/EditContent.html
index a6736605c8..31eac84490 100644
--- a/ext/message_admin/ang/crmMsgadm/EditContent.html
+++ b/ext/message_admin/ang/crmMsgadm/EditContent.html
@@ -15,7 +15,7 @@
       <div class="clearfix"></div>
     </div>
     <div class="panel-body" uib-collapse="!accordions.msg_subject">
-      <div ng-model="$ctrl.options.record.msg_subject"
+      <div ng-model="$ctrl.msgtpl.msg_subject"
            crm-monaco="$ctrl.monacoOptions({language: 'smarty', crmHeightPct: 0.15})"
            crm-monaco-insert-rx="insert:msg_subject"
            ng-disabled="$ctrl.isDisabled()"
@@ -45,7 +45,7 @@
       <div class="clearfix"></div>
     </div>
     <div class="panel-body" uib-collapse="!accordions.msg_html">
-      <div ng-model="$ctrl.options.record.msg_html"
+      <div ng-model="$ctrl.msgtpl.msg_html"
            crm-monaco="$ctrl.monacoOptions({language: 'html', crmHeightPct: 0.5})"
            crm-monaco-insert-rx="insert:msg_html"
            ng-disabled="$ctrl.isDisabled()"
@@ -74,7 +74,7 @@
       <div class="clearfix"></div>
     </div>
     <div class="panel-body" uib-collapse="!accordions.msg_text">
-      <div ng-model="$ctrl.options.record.msg_text"
+      <div ng-model="$ctrl.msgtpl.msg_text"
            crm-monaco="$ctrl.monacoOptions({language: 'smarty', crmHeightPct: 0.5})"
            crm-monaco-insert-rx="insert:msg_text"
            ng-disabled="$ctrl.isDisabled()"
diff --git a/ext/message_admin/ang/crmMsgadm/EditContent.js b/ext/message_admin/ang/crmMsgadm/EditContent.js
index 0f8def1f6c..3c429a321e 100644
--- a/ext/message_admin/ang/crmMsgadm/EditContent.js
+++ b/ext/message_admin/ang/crmMsgadm/EditContent.js
@@ -4,7 +4,7 @@
       onPreview: '&',
       tokenList: '<',
       disabled: '<',
-      options: '='
+      msgtpl: '='
     },
     templateUrl: '~/crmMsgadm/EditContent.html',
     controller: function ($scope, $element, crmStatus, crmUiAlert, dialogService, $rootScope) {
@@ -31,7 +31,7 @@
           openPreview: function(options) {
             return $ctrl.openPreview(options);
           },
-          record: $ctrl.options.record,
+          record: $ctrl.msgtpl,
           field: fld,
           tokenList: $ctrl.tokenList
         };
-- 
2.25.1