From 925f4ca1da780255163231a9d90cfe2e5424b943 Mon Sep 17 00:00:00 2001
From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
Date: Fri, 5 Oct 2018 11:56:31 +0100
Subject: [PATCH] Bug 20772: (follow-up) Fix DB updates and templates

Carry out changes requested in commenbt #27

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 ...bug_20772-add-price_paid_column_to_illrequests.perl |  2 +-
 ...0772-add-readonly-flag-to-illrequestattributes.perl |  2 +-
 .../intranet-tmpl/prog/en/modules/ill/ill-requests.tt  | 10 +++++-----
 .../opac-tmpl/bootstrap/en/modules/opac-illrequests.tt | 10 +++++++---
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/installer/data/mysql/atomicupdate/bug_20772-add-price_paid_column_to_illrequests.perl b/installer/data/mysql/atomicupdate/bug_20772-add-price_paid_column_to_illrequests.perl
index 5d32fb7914..f7207926ab 100644
--- a/installer/data/mysql/atomicupdate/bug_20772-add-price_paid_column_to_illrequests.perl
+++ b/installer/data/mysql/atomicupdate/bug_20772-add-price_paid_column_to_illrequests.perl
@@ -2,7 +2,7 @@ $DBversion = 'XXX';  # will be replaced by the RM
 if( CheckVersion( $DBversion ) ) {
 
      if( !column_exists( 'illrequests', 'price_paid' ) ) {
-        $dbh->do( "ALTER TABLE illrequests ADD COLUMN price_paid varchar(20) DEFAULT NULL" );
+        $dbh->do( "ALTER TABLE illrequests ADD COLUMN price_paid varchar(20) DEFAULT NULL AFTER 'cost'" );
      }
 
     SetVersion( $DBversion );
diff --git a/installer/data/mysql/atomicupdate/bug_20772-add-readonly-flag-to-illrequestattributes.perl b/installer/data/mysql/atomicupdate/bug_20772-add-readonly-flag-to-illrequestattributes.perl
index ab64c158be..7707bc55e8 100644
--- a/installer/data/mysql/atomicupdate/bug_20772-add-readonly-flag-to-illrequestattributes.perl
+++ b/installer/data/mysql/atomicupdate/bug_20772-add-readonly-flag-to-illrequestattributes.perl
@@ -2,7 +2,7 @@ $DBversion = 'XXX';  # will be replaced by the RM
 if( CheckVersion( $DBversion ) ) {
 
      if( !column_exists( 'illrequestattributes', 'readonly' ) ) {
-        $dbh->do( "ALTER TABLE illrequestattributes ADD COLUMN readonly tinyint(1) NOT NULL DEFAULT 1" );
+        $dbh->do( "ALTER TABLE illrequestattributes ADD COLUMN readonly tinyint(1) NOT NULL DEFAULT 1 AFTER 'value'" );
         $dbh->do( "UPDATE illrequestattributes SET readonly = 1" );
      }
 
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 74d748a396..8b9ac8a52b 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
@@ -429,7 +429,7 @@
                                 </li>
                                 <li class="cost">
                                     <label class="cost">Cost:</label>
-                                    [% request.cost || 'N/A' | html %]
+                                    [% IF request.cost %][% request.cost | html %][% ELSE %]<span>N/A</span>[% END %]
                                 </li>
                                 <li class="price_paid">
                                     <label class="price_paid">Price paid:</label>
@@ -502,7 +502,7 @@
                             <div class="rows">
                                 <div class="orderid">
                                     <span class="label orderid">Order ID:</span>
-                                    [% request.orderid || "N/A" | html %]
+                                    [% IF request.orderid %][% request.orderid | html %][% ELSE %]<span>N/A</span>[% END %]
                                 </div>
                                 <div class="borrowernumber">
                                     <span class="label borrowernumber">Patron:</span>
@@ -514,7 +514,7 @@
 
                                 <div class="biblio_id">
                                     <span class="label biblio_id">Bibliographic record ID:</span>
-                                    [% request.biblio_id || "N/A" | html %]
+                                    [% IF request.biblio_id %][% request.biblio_id | html %][% ELSE %]<span>N/A</span>[% END %]
                                 </div>
                                 <div class="branchcode">
                                     <span class="label branchcode">Library:</span>
@@ -534,11 +534,11 @@
                                 </div>
                                 <div class="cost">
                                     <span class="label cost">Cost:</span>
-                                    [% request.cost || "N/A" | html %]
+                                    [% IF request.cost %][% request.cost | html %][% ELSE %]<span>N/A</span>[% END %]
                                 </div>
                                 <div class="price_paid">
                                     <span class="label price_paid">Price paid:</span>
-                                    [% request.price_paid || "N/A" %]
+                                    [% IF request.price_paid %][% request.price_paid | html %][% ELSE %]<span>N/A</span>[% END %]
                                 </div>
                                 <div class="req_id">
                                     <span class="label req_id">Request number:</span>
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 838f827951..c44f4199a1 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-illrequests.tt
@@ -125,8 +125,12 @@
                             [% FOREACH request IN requests %]
                                 [% status = request.status | html %]
                                 <tr>
-                                    <td>[% request.metadata.Author || 'N/A' | html %]</td>
-                                    <td>[% request.metadata.Title || 'N/A' | html %]</td>
+                                    <td>
+                                        [% IF request.metadata.Author %][% request.metadata.Author | html %][% ELSE %]<span>N/A</span>[% END %]
+                                    </td>
+                                    <td>
+                                        [% IF request.metadata.Title %][% request.metadata.Title | html %][% ELSE %]<span>N/A</span>[% END %]
+                                    </td>
                                     <td>[% request.backend | html %]</td>
                                     <td>[% request.medium | html %]</td>
                                     <td>[% request.capabilities.$status.name | html %]</td>
@@ -192,7 +196,7 @@
                                 [% FOREACH meta IN request.metadata %]
                                     <div class="requestattr-[% meta.key | html %]">
                                         <span class="label">[% meta.key | html %]:</span>
-                                        [% meta.value || 'N/A' | html %]
+                                        [% IF meta.value %][% meta.value | html %][% ELSE %]<span>N/A</span>[% END %]
                                     </div>
                                 [% END %]
                             </div>
-- 
2.39.5