From f9d7be1e0e0539bf353edbbece7b1b844d5d5ee1 Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Thu, 18 Oct 2018 11:58:45 +0100 Subject: [PATCH] Bug 21063: (follow-up) Fix bad merge At some point an incomplete merge had crept in --- koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt index 4a7a9dbe6c..5af0cde22c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -87,11 +87,6 @@ '' : ''; }; - // Our 'render' function for the library name - var createLibrary = function(data, type, row) { - return row.library.branchname; - }; - // Render function for request ID var createRequestId = function(data, type, row) { return row.id_prefix + row.illrequest_id; @@ -164,14 +159,12 @@ status: { func: createStatus }, -<<<<<<< HEAD biblio_id: { name: _("Bibliograpic record ID"), func: createBiblioLink -======= + }, metadata_Medium: { func: createType ->>>>>>> Bug 21063: Add ability to show / hide columns }, metadata_Type: { func: createType -- 2.11.0