@@ -, +, @@
issues
---
Koha/Illrequest/Config.pm | 2 +-
koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 4 ---
.../prog/en/modules/ill/ill-requests.tt | 39 +++++++++++-----------
3 files changed, 21 insertions(+), 24 deletions(-)
--- a/Koha/Illrequest/Config.pm
+++ a/Koha/Illrequest/Config.pm
@@ -19,7 +19,7 @@ package Koha::Illrequest::Config;
use Modern::Perl;
-use File::Basename;
+use File::Basename qw/basename/;
use C4::Context;
--- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
+++ a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css
@@ -3137,7 +3137,3 @@ fieldset.rows + fieldset.action {
table#ill-requests {
width: 100% !important;
}
-
-table#ill-requests th {
- text-transform: capitalize;
-}
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
@@ -1,5 +1,6 @@
[% USE Branches %]
[% USE Koha %]
+[% USE KohaDates %]
[% INCLUDE 'doc-head-open.inc' %]
Koha › ILL requests ›
@@ -113,7 +114,7 @@
null :
row[thisCol];
});
- }
+ };
// Strip the expand prefix if it exists, we do this for display
var stripPrefix = function(value) {
@@ -125,7 +126,7 @@
};
// Our 'render' function for borrowerlink
- var createBorrowerLink = function(data, type, row) {
+ var createPatronLink = function(data, type, row) {
return '' +
@@ -157,7 +158,7 @@
'method=illview&illrequest_id=' +
row.illrequest_id +
'">Manage request' +
- ''
+ '';
};
// Columns that require special treatment
@@ -167,8 +168,8 @@
func: createActionLink
},
borrowername: {
- name: 'Borrower',
- func: createBorrowerLink
+ name: 'Patron',
+ func: createPatronLink
},
illrequest_id: {
name: 'Request number',
@@ -179,10 +180,10 @@
func: createStatus
},
biblio_id: {
- name: 'Biblio number'
+ name: 'Biblio ID'
},
branchcode: {
- name: 'Branch code'
+ name: 'Library'
}
};
@@ -192,7 +193,7 @@
.replace(/^filter/, '')
.replace(/([A-Z])/g, "_$1")
.replace(/^_/,'').toLowerCase();
- };
+ }
// Toggle request attributes in Illview
$('#toggle_requestattributes').click(function() {
@@ -238,7 +239,7 @@
extra.forEach(function(thisExtra) {
allCols[thisExtra] = 1;
});
- };
+ }
// Different requests will have different columns,
// make sure they all have the same
$.each(dataCopy, function(k, row) {
@@ -272,7 +273,7 @@
) {
colObj.render = specialCols[thisCol].func;
} else {
- colObj.data = thisCol
+ colObj.data = thisCol;
}
colData.push(colObj);
});
@@ -492,15 +493,15 @@
-
-
+
-
-
+
-
-
+
-
- [% request.updated %]
+ [% request.updated | $KohaDates with_hours => 1 %]
-
@@ -530,7 +531,7 @@
-
- [% request.cost %]
+ [% request.cost || 'N/A' %]
-
@@ -597,7 +598,7 @@
[% request.orderid || "N/A" %]
- Biblio number:
+ Biblio ID:
[% request.biblio_id || "N/A" %]
- Branch:
+ Library:
[% Branches.GetName(request.branchcode) %]
@@ -618,7 +619,7 @@
Last updated:
- [% request.updated %]
+ [% request.updated | $KohaDates with_hours => 1 %]
Request type:
--