From e6807a29afd05128efb3c05024a9d9803a02cbc5 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 4 Nov 2013 12:23:23 +0100 Subject: [PATCH] Bug 9673: QA followup This followup fixes the wthdrawn typo exist in updatedatabase.pl and does not display the lostitem date if the lostitem value is not set (!= ""). Signed-off-by: Jonathan Druart Signed-off-by: Galen Charlton --- installer/data/mysql/updatedatabase.pl | 4 ++-- .../intranet-tmpl/prog/en/modules/catalogue/moredetail.tt | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 535cbfee9e..6fd42f2432 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7846,9 +7846,9 @@ if(CheckVersion($DBversion)) { $DBversion = "3.13.00.XXX"; if ( CheckVersion($DBversion) ) { $dbh->do("ALTER TABLE items ADD itemlost_on DATETIME NULL AFTER itemlost"); - $dbh->do("ALTER TABLE items ADD withdrawn_on DATETIME NULL AFTER wthdrawn"); + $dbh->do("ALTER TABLE items ADD withdrawn_on DATETIME NULL AFTER withdrawn"); $dbh->do("ALTER TABLE deleteditems ADD itemlost_on DATETIME NULL AFTER itemlost"); - $dbh->do("ALTER TABLE deleteditems ADD withdrawn_on DATETIME NULL AFTER wthdrawn"); + $dbh->do("ALTER TABLE deleteditems ADD withdrawn_on DATETIME NULL AFTER withdrawn"); print "Upgrade to $DBversion done (Bug 9673 - Track when items are marked as lost or withdrawn)\n"; SetVersion ($DBversion); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index d54513dfbe..86d4e340a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -127,7 +127,9 @@   [% END %] - [% IF ITEM_DAT.itemlost_on %]
  • Lost on:[% ITEM_DAT.itemlost_on | $KohaDates %]  
  • [% END %] + [% IF ITEM_DAT.itemlost != "" && ITEM_DAT.itemlost_on %] +
  • Lost on:[% ITEM_DAT.itemlost_on | $KohaDates %]  
  • + [% END %] [% END %] [% IF ( ITEM_DAT.itemdamagedloop ) %]
  • Damaged status: -- 2.39.5