From 74395c1b46f454dc74ea1621b5747d48e402c6e1 Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Tue, 17 Apr 2018 12:03:07 +0100 Subject: [PATCH] Bug 20581: Add display of status_alias to staff vw - This patch adds display of the new status_alias value, when set, in favour of the request's status value. - It also allows the user to set a status_alias for an existing request. When set, this value will be displayed in preference to the status. Signed-off-by: Niamh.Walker-Headon@it-tallaght.ie --- ill/ill-requests.pl | 11 +- .../prog/en/modules/ill/ill-requests.tt | 535 ++++++++++++++++++++- 2 files changed, 542 insertions(+), 4 deletions(-) diff --git a/ill/ill-requests.pl b/ill/ill-requests.pl index 28e8cc634f..a2afb6f9a4 100755 --- a/ill/ill-requests.pl +++ b/ill/ill-requests.pl @@ -129,8 +129,11 @@ if ( $backends_available ) { value => {} }; $template->param( - whole => $backend_result, - request => $request + whole => $backend_result, + request => $request, + status_aliases => scalar Koha::AuthorisedValues->search( + { category => 'ILLSTATUS' } + ) ); } else { # Commit: @@ -141,6 +144,10 @@ if ( $backends_available ) { $request->price_paid($params->{price_paid}); $request->notesopac($params->{notesopac}); $request->notesstaff($params->{notesstaff}); + my $alias = ($params->{status_alias} =~ /\d/) ? + $params->{status_alias} : + undef; + $request->status_alias($alias); $request->store; my $backend_result = { error => 0, 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 f2a833f4f0..e9ab966b6c 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 @@ -445,7 +445,25 @@
  • [% stat = request.status %] - [% request.capabilities.$stat.name | html %] + [% current_alias = request.status_alias %] +
  • @@ -555,7 +573,11 @@
  • Status: - [% request.capabilities.$req_status.name | html %] + [% IF request.statusalias %] + [% request.statusalias.authorised_value | html %] + [% ELSE %] + [% request.capabilities.$req_status.name | html%] + [% END %]
  • Last updated: @@ -707,4 +729,513 @@ [% CATCH %] [% END %] +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + [% INCLUDE 'calendar.inc' %] + [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] -- 2.11.0