Attachment 81693 Details for Bug 20941 – Bug 20941: (follow-up) Update N/A handling

[patch] Bug 20941: (follow-up) Update N/A handling

Bug-20941-follow-up-Update-NA-handling.patch (text/plain), 3.74 KB, created by Josef Moravec on 2018-10-31 09:54:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josef Moravec

Created: 2018-10-31 09:54:00 UTC

Size: 3.74 KB

patch

obsolete

>From 611069122d8efa02674f4b937f650efd909f03f5 Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>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 <josef.moravec@gmail.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 6 +++---
> koha-tmpl/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 081000d..dea0a48 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 @@
> </li>
> <li class="medium">
> <label class="medium">Request type:</label>
>- [% type || 'N/A' | html %]
>+ [% IF type %][% type | html %][% ELSE %]N/A[% END %]
> </li>
> <li class="cost">
> <label class="cost">Cost:</label>
>@@ -559,8 +559,8 @@
> </div>
> <div class="medium">
> Request type:
>- % type = request.get_type %]
>- [% type || 'N/A' | html %]
>+ [% type = request.get_type %]
>+ [% IF type %][% type | html %][% ELSE %]N/A[% END %]
> </div>
> <div class="cost">
> 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 1016b86..9fd474d 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 %]
> </td>
> <td>[% request.backend | html %]</td>
>- <td>[% type || 'N/A' | html %]</td>
>+ <td>
>+ [% IF type %][% type | html %][% ELSE %]N/A[% END %]
>+ </td>
> <td>[% request.capabilities.$status.name | html %]</td>
> <td>[% request.placed | $KohaDates %]</td>
> <td>[% request.updated | $KohaDates %]</td>
>@@ -180,7 +182,7 @@
> </li>
> <li>
> <label for="medium">Request type:</label>
>- [% type || 'N/A' | html %]
>+ [% IF type %][% type | html %][% ELSE %]N/A[% END %]
> </li>
> <li>
> <label for="placed">Request placed:</label>
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 20941: 76052 | 79577 | 79825 | 79865 | 79918 | 79919 | 79920 | 79921 | 79945 | 79999 | 80112 | 80113 | 80114 | 80115 | 80116 | 80117 | 80127 | 80128 | 80129 | 80130 | 80131 | 80132 | 80212 | 81688 | 81689 | 81690 | 81691 | 81692 | 81693 | 81694