From 99fc3d3a45fd7ed4b91f03cf9c5ef8603769f6f3 Mon Sep 17 00:00:00 2001
From: spartanicus <arlen@dogenmedia.com>
Date: Tue, 12 Oct 2021 10:39:45 -0400
Subject: [PATCH] Ensure identifying field is in first column of index view
 (CO-2242)

---
 app/templates/Matchgrids/pending.php  | 8 ++++----
 app/templates/Permissions/columns.inc | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/templates/Matchgrids/pending.php b/app/templates/Matchgrids/pending.php
index 968794077..3fed4d7fc 100644
--- a/app/templates/Matchgrids/pending.php
+++ b/app/templates/Matchgrids/pending.php
@@ -38,15 +38,12 @@
 
 <table>
   <tr>
-    <th><?= __('match.fd.sor'); ?></th>
     <th><?= __('match.fd.sorid'); ?></th>
+    <th><?= __('match.fd.sor'); ?></th>
     <th><?= __('match.fd.request_time'); ?></th>
   </tr>
   <?php foreach($vv_pending as $p): ?>
   <tr class="linked-row spin">
-    <td>
-      <?= $p['sor']; ?>
-    </td>
     <td>
       <?= $this->Html->link(
         $p['sorid'],
@@ -56,6 +53,9 @@
         ['class' => 'row-link']
       ); ?>
     </td>
+    <td>
+      <?= $p['sor']; ?>
+    </td>
     <td>
       <?= $p['request_time']; ?>
     </td>
diff --git a/app/templates/Permissions/columns.inc b/app/templates/Permissions/columns.inc
index 1c65d1557..9be86bcc1 100644
--- a/app/templates/Permissions/columns.inc
+++ b/app/templates/Permissions/columns.inc
@@ -26,10 +26,10 @@
  */
 
 $indexColumns = [
-  'matchgrid_id' => [ 'type' => 'fk' ],
   'username' => [
     'type' => 'link'
   ],
+  'matchgrid_id' => [ 'type' => 'fk' ],
   'permission' => [
     'type' => 'enum',
     'class' => 'PermissionEnum'