From 85492a6901b62b92d0433166827f830d4934c453 Mon Sep 17 00:00:00 2001
From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
Date: Tue, 5 Feb 2019 15:45:02 +0000
Subject: [PATCH] Bug 18589: (follow-up) Fix rebase errors

Minor rebase errors
---
 .../prog/en/includes/ill-list-table.inc             |  1 +
 koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js   | 21 +++++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc
index 0b6169a27d..0cdb4b4bb1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/ill-list-table.inc
@@ -30,6 +30,7 @@
                 <th scope="col">Completed on</th>
                 <th scope="col">Access URL</th>
                 <th scope="col">Cost</th>
+                <th scope="col">Comments</th>
                 <th scope="col">OPAC notes</th>
                 <th scope="col">Staff notes</th>
                 <th scope="col">Backend</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js b/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js
index 58904192e4..9c71174585 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js
@@ -31,10 +31,14 @@ $(document).ready(function() {
             prep: function(tableData, oData) {
                 var uniques = {};
                 tableData.forEach(function(row) {
-                    var resolvedName = getStatusName(
-                        oData[0].capabilities[row.status].name,
-                        row
-                    );
+                    var resolvedName;
+                    if (row.status_alias) {
+                        resolvedName = row.status_alias.lib;
+                    } else {
+                        resolvedName = getStatusName(
+                            oData[0].capabilities[row.status].name
+                        );
+                    }
                     uniques[resolvedName] = 1
                 });
                 Object.keys(uniques).sort().forEach(function(unique) {
@@ -266,7 +270,7 @@ $(document).ready(function() {
         action: {
             func: createActionLink
         },
-        patron: {
+        borrowernumber: {
             func: createPatronLink
         },
         illrequest_id: {
@@ -286,7 +290,7 @@ $(document).ready(function() {
             name: _("Updated on"),
         },
         patron_cardnumber: {
-            name: _("Patron barcode")
+            name: _("Cardnumber")
         }
     };
 
@@ -397,6 +401,11 @@ $(document).ready(function() {
                         // unformatted column
                         'aTargets': [ 'updated_formatted'],
                         'iDataSort': 18
+                    },
+                    {
+                        'aTargets': [ 'patron_cardnumber' ],
+                        'bVisible': false,
+                        'bSearchable': true
                     }
                 ],
                 'aaSorting': [[ 18, 'desc' ]], // Default sort, updated descending
-- 
2.11.0