From efc92a5ea2fc0aed90cc93dae1a0024c886fd80a Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Fri, 5 Oct 2018 08:56:45 +0100 Subject: [PATCH] Bug 20941: (follow-up) Update N/A handling Modify the conditional display of N/A in accordance with comment #17 Signed-off-by: Josef Moravec Signed-off-by: Nick Clemens --- koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 6 +++--- .../opac-tmpl/bootstrap/en/modules/opac-illrequests.tt | 6 ++++-- 2 files changed, 7 insertions(+), 5 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 081000d9d6..dea0a48127 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 @@ -450,7 +450,7 @@
  • - [% type || 'N/A' | html %] + [% IF type %][% type | html %][% ELSE %]N/A[% END %]
  • @@ -559,8 +559,8 @@
    Request type: - % type = request.get_type %] - [% type || 'N/A' | html %] + [% type = request.get_type %] + [% IF type %][% type | html %][% ELSE %]N/A[% END %]
    Cost: diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt index 1016b86e88..9fd474dd71 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt @@ -136,7 +136,9 @@ [% IF request.metadata.Title %][% request.metadata.Title | html %][% ELSE %]N/A[% END %] [% request.backend | html %] - [% type || 'N/A' | html %] + + [% IF type %][% type | html %][% ELSE %]N/A[% END %] + [% request.capabilities.$status.name | html %] [% request.placed | $KohaDates %] [% request.updated | $KohaDates %] @@ -180,7 +182,7 @@
  • - [% type || 'N/A' | html %] + [% IF type %][% type | html %][% ELSE %]N/A[% END %]
  • -- 2.39.5