Attachment 38179 Details for Bug 7981 – [SIGNED-OFF] Bug 7981: Follow-up - Fix qa script complaints

[patch] [SIGNED-OFF] Bug 7981: Follow-up - Fix qa script complaints

SIGNED-OFF-Bug-7981-Follow-up---Fix-qa-script-comp.patch (text/plain), 3.36 KB, created by Kyle M Hall (khall) on 2015-04-20 11:48:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2015-04-20 11:48:08 UTC

Size: 3.36 KB

patch

obsolete

>From c1fa9e0bb2bf009063cd2f70a32df6c66f94e5d7 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Mon, 20 Apr 2015 07:24:12 +0200
>Subject: [PATCH] [SIGNED-OFF] Bug 7981: Follow-up - Fix qa script complaints
>
>- Fix updatedatabase, moving the update entry into the right spot
>- Fix some tabs
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> installer/data/mysql/updatedatabase.pl             |   17 ++++++++++-------
> .../intranet-tmpl/prog/en/modules/circ/returns.tt  |    4 ++--
> 2 files changed, 12 insertions(+), 9 deletions(-)
>
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 1c5c3d5..526e4a0 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -8502,13 +8502,6 @@ if ( CheckVersion($DBversion) ) {
>     ");
> 
>     print "Upgrade to $DBversion done (Bug 10500 - Improve isbn matching when importing records)\n";
>-
>-$DBversion = "3.15.00.XXX";
>-if ( CheckVersion($DBversion) ) {
>-    $dbh->do(q{
>-        DELETE FROM systempreferences WHERE variable = 'HomeOrHoldingBranchReturn';
>-    });
>-    print "Upgrade to $DBversion done (Bug 7981 - Transfer message on return. HomeOrHoldingBranchReturn syspref removed in favour of circulation rules.)\n";
>     SetVersion($DBversion);
> }
> 
>@@ -10042,6 +10035,16 @@ if ( CheckVersion($DBversion) ) {
>     SetVersion ($DBversion);
> }
> 
>+
>+$DBversion = "3.19.00.XXX";
>+if ( CheckVersion($DBversion) ) {
>+    $dbh->do(q{
>+        DELETE FROM systempreferences WHERE variable = 'HomeOrHoldingBranchReturn';
>+    });
>+    print "Upgrade to $DBversion done (Bug 7981 - Transfer message on return. HomeOrHoldingBranchReturn syspref removed in favour of circulation rules.)\n";
>+    SetVersion($DBversion);
>+}
>+
> # DEVELOPER PROCESS, search for anything to execute in the db_update directory
> # SEE bug 13068
> # if there is anything in the atomicupdate, read and execute it.
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>index 0cb6c72..e17bf5c 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -276,7 +276,7 @@ $(document).ready(function () {
>         [% IF ( soundon ) %]
>         <audio src="[% interface %]/[% theme %]/sound/opening.ogg" autoplay="autoplay" autobuffer="autobuffer"></audio>
>         [% END %]
>-	<div id="item-transfer" class="dialog message"><h3> This item needs to be transferred to [% Branches.GetName( returnbranchname ) %]</h3>
>+    <div id="item-transfer" class="dialog message"><h3> This item needs to be transferred to [% Branches.GetName( returnbranchname ) %]</h3>
>     Transfer now?<br />
>     <form method="post" action="returns.pl" name="mainform" id="mainform">
>     [% IF itemnumber %]
>@@ -284,7 +284,7 @@ $(document).ready(function () {
>     [% END %]
> 	<input type="submit" name="dotransfer" value="Yes" class="submit" />
> 	<input type="submit" name="notransfer" value="No" class="submit" />
>-	<input type="hidden" name="tobranch" value="[% returnbranch %]" />
>+    <input type="hidden" name="tobranch" value="[% returnbranch %]" />
> 	<input type="hidden" name="transferitem" value="[% itemnumber %]" />
>         <input type="hidden" name="exemptfine" value="[% exemptfine %]" />
>         <input type="hidden" name="dropboxmode" value="[% dropboxmode %]" />
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 7981: 26723 | 27487 | 27950 | 27992 | 28199 | 33455 | 36615 | 37724 | 37725 | 37726 | 38151 | 38174 | 38176 | 38177 | 38178 | 38179 | 38180 | 38237 | 38238 | 38241 | 38242 | 38243 | 38244 | 38245 | 39504 | 39848 | 39849 | 39850 | 39851 | 39852 | 39853