Attachment 22691 Details for Bug 9673 – Bug 9673: QA followup

[patch] Bug 9673: QA followup

Bug-9673-QA-followup.patch (text/plain), 2.46 KB, created by Jonathan Druart on 2013-11-04 11:26:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2013-11-04 11:26:47 UTC

Size: 2.46 KB

patch

obsolete

>From 13451324404f6b09b2fc874be719e30bd00a75ff Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>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 <jonathan.druart@biblibre.com>
>---
> installer/data/mysql/updatedatabase.pl | 4 ++--
> koha-tmpl/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 f1d1919..1f2729c 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -7746,9 +7746,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 d54513d..86d4e34 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 @@
> &nbsp;
> [% END %]
> </li>
>- [% IF ITEM_DAT.itemlost_on %]<li>Lost on:[% ITEM_DAT.itemlost_on | $KohaDates %] &nbsp;</li>[% END %]
>+ [% IF ITEM_DAT.itemlost != "" && ITEM_DAT.itemlost_on %]
>+ <li>Lost on:[% ITEM_DAT.itemlost_on | $KohaDates %] &nbsp;</li>
>+ [% END %]
> [% END %]
> [% IF ( ITEM_DAT.itemdamagedloop ) %]
> <li>Damaged status:
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 9673: 15567 | 15890 | 16002 | 16003 | 16032 | 16033 | 16642 | 16643 | 16644 | 16645 | 16646 | 18031 | 18032 | 18033 | 18034 | 19013 | 19014 | 19079 | 19080 | 19120 | 19121 | 19483 | 19484 | 19485 | 19486 | 19487 | 19488 | 19489 | 19490 | 19492 | 21730 | 21731 | 22690 | 22691