From 8c2629355a52a80991c8b089019b4b7a217b687b 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 --- .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 12 ++++++------ .../opac-tmpl/bootstrap/en/modules/opac-illrequests.tt | 16 +++++++++++----- 2 files changed, 17 insertions(+), 11 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 918d41556c..7726ca525e 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 @@ -438,11 +438,11 @@
  • - [% type || 'N/A' | html %] + [% IF type %][% type | html %][% ELSE %]N/A[% END %]
  • - [% request.cost || 'N/A' | html %] + [% IF request.cost %][% request.cost | html %][% ELSE %]N/A[% END %]
  • @@ -510,7 +510,7 @@
    Order ID: - [% request.orderid || 'N/A' | html %] + [% IF request.orderid %][% request.orderid | html %][% ELSE %]N/A[% END %]
    Patron: @@ -522,7 +522,7 @@
    Bibliographic record ID: - [% request.biblio_id || 'N/A' | html %] + [% IF request.biblio_id %][% request.biblio_id | html %][% ELSE %]N/A[% END %]
    Library: @@ -539,11 +539,11 @@
    Request type: % type = request.get_type %] - [% type || 'N/A' | html %] + [% IF type %][% type | html %][% ELSE %]N/A[% END %]
    Cost: - [% request.cost || 'N/A' | html %] + [% IF request.cost %][% request.cost | html %][% ELSE %]N/A[% END %]
    Request number: 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 e3ff91f353..34b1183fe3 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt @@ -126,10 +126,16 @@ [% status = request.status | html %] [% type = request.get_type %] - [% request.metadata.Author || 'N/A' | html %] - [% request.metadata.Title || 'N/A' | html %] + + [% IF request.metadata.Author %][% request.metadata.Author | html %][% ELSE %]N/A[% END %] + + + [% 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 | html %] [% request.updated | html %] @@ -169,7 +175,7 @@
  • - [% type || 'N/A' | html %] + [% IF type %][% type | html %][% ELSE %]N/A[% END %]
  • @@ -194,7 +200,7 @@ [% FOREACH meta IN request.metadata %]
    [% meta.key | html %]: - [% meta.value || 'N/A' | html %] + [% IF meta.value %][% meta.value | html %][% ELSE %]N/A[% END %]
    [% END %] -- 2.11.0