From ddd72b3b5932b720c5dc6f7d183f0c7a8ba67f11 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 14 Jun 2021 23:15:25 -0700
Subject: [PATCH] msgtplui - On "User-Driven" tab, connect "Edit" button to old
 UI

Relatedly, when the user-returns, cleanup the resulting URL.
---
 ext/msgtplui/CRM/Msgtplui/Page/MsgtplBasePage.php | 10 ++++++++++
 ext/msgtplui/ang/msgtplui/ListCtrl.js             | 13 +++++++++++--
 ext/msgtplui/ang/msgtplui/User.html               |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ext/msgtplui/CRM/Msgtplui/Page/MsgtplBasePage.php b/ext/msgtplui/CRM/Msgtplui/Page/MsgtplBasePage.php
index baa00d4e1f..df54ed4e90 100644
--- a/ext/msgtplui/CRM/Msgtplui/Page/MsgtplBasePage.php
+++ b/ext/msgtplui/CRM/Msgtplui/Page/MsgtplBasePage.php
@@ -4,6 +4,16 @@ use CRM_Msgtplui_ExtensionUtil as E;
 class CRM_Msgtplui_Page_MsgtplBasePage extends CRM_Core_Page {
 
   public function run() {
+    // Did we get an old school URL? Translate to preferred format.
+    $child = CRM_Utils_Request::retrieve('selectedChild', 'String');
+    switch ($child) {
+      case 'user':
+      case 'workflow':
+        $url = CRM_Utils_System::url('civicrm/admin/messageTemplates/', NULL, TRUE, '/' . $child, FALSE);
+        CRM_Utils_System::redirect($url);
+        break;
+    }
+
     /** @var \Civi\Angular\AngularLoader $loader */
     CRM_Utils_System::setTitle(ts('Message Templates'));
     $loader = \Civi::service('angularjs.loader');
diff --git a/ext/msgtplui/ang/msgtplui/ListCtrl.js b/ext/msgtplui/ang/msgtplui/ListCtrl.js
index 3a308e9370..e4b21b0a93 100644
--- a/ext/msgtplui/ang/msgtplui/ListCtrl.js
+++ b/ext/msgtplui/ang/msgtplui/ListCtrl.js
@@ -18,12 +18,21 @@
     var ctrl = this;
     ctrl.records = records;
 
-    ctrl.editUrl = function(record, stage) {
+    /**
+     *
+     * @param record
+     * @param variant - One of null 'legacy', 'current', 'draft'. (If null, then 'current'.)
+     * @returns {string}
+     */
+    ctrl.editUrl = function(record, variant) {
+      if (variant === 'legacy') {
+        return CRM.url('civicrm/admin/messageTemplates/add', {action: 'update', id: record.id, reset: 1});
+      }
       var url = '#/edit?id=' + encodeURIComponent(record.id);
       if (record['tx.language']) {
         url = url + '&lang=' + encodeURIComponent(record['tx.language']);
       }
-      if (stage === 'draft') {
+      if (variant === 'draft') {
         url = url + '&status=draft';
       }
       return url;
diff --git a/ext/msgtplui/ang/msgtplui/User.html b/ext/msgtplui/ang/msgtplui/User.html
index bf688c14ee..178d937773 100644
--- a/ext/msgtplui/ang/msgtplui/User.html
+++ b/ext/msgtplui/ang/msgtplui/User.html
@@ -28,7 +28,7 @@
       <td>{{record.msg_subject}}</td>
       <td>{{record.is_active ? ts('Yes') : ts('No')}}</td>
       <td class="text-right">
-        <a class="btn btn-xs btn-default" ng-href="#/edit?id={{record.id}}">{{ts('Edit')}}</a>
+        <a class="btn btn-xs btn-default" ng-href="{{$ctrl.editUrl(record, 'legacy')}}">{{ts('Edit')}}</a>
         <a class="btn btn-xs btn-default" ng-click="$ctrl.toggle(record)" ng-if="!!record.is_active">{{ts('Disable')}}</a>
         <a class="btn btn-xs btn-default" ng-click="$ctrl.toggle(record)" ng-if="!record.is_active">{{ts('Enable')}}</a>
         <a class="btn btn-xs btn-danger" crm-confirm="{type: 'delete', obj: record}" on-yes="$ctrl.delete(record)">{{ts('Delete')}}</a>
-- 
2.25.1