From d3624e747321f41b1965f9059faf84ec08e2b57b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 15 Jun 2021 15:00:44 -0700
Subject: [PATCH] msgtplui - Always put normal MsgTpl above its translations

---
 ext/msgtplui/ang/msgtplui/ListCtrl.js   | 8 +++++++-
 ext/msgtplui/ang/msgtplui/Workflow.html | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ext/msgtplui/ang/msgtplui/ListCtrl.js b/ext/msgtplui/ang/msgtplui/ListCtrl.js
index 6900aa21b4..b8a0d716e6 100644
--- a/ext/msgtplui/ang/msgtplui/ListCtrl.js
+++ b/ext/msgtplui/ang/msgtplui/ListCtrl.js
@@ -32,7 +32,13 @@
     });
 
     var ctrl = this;
-    ctrl.records = [].concat(prefetch.records, _.map(prefetch.translations || [], simpleKeys));
+    ctrl.records = _.map(
+      [].concat(prefetch.records, _.map(prefetch.translations || [], simpleKeys)),
+      function(r) {
+        r._is_translation = (r.tx_language !== undefined);
+        return r;
+      }
+    );
 
     /**
      *
diff --git a/ext/msgtplui/ang/msgtplui/Workflow.html b/ext/msgtplui/ang/msgtplui/Workflow.html
index 6a1515fbe4..a54f0237bc 100644
--- a/ext/msgtplui/ang/msgtplui/Workflow.html
+++ b/ext/msgtplui/ang/msgtplui/Workflow.html
@@ -19,7 +19,7 @@
     </tr>
     </thead>
     <tbody>
-    <tr ng-repeat="record in $ctrl.records | filter:filters.text | orderBy:['msg_title','tx_language_label']">
+    <tr ng-repeat="record in $ctrl.records | filter:filters.text | orderBy:['msg_title','_is_translation','tx_language_label']">
       <td>{{record.msg_title}}</td>
       <td>{{record.tx_language_label || ts('Standard')}}</td>
       <td>
-- 
2.25.1