Attachment 39851 Details for Bug 7981 – Bug 7981: Follow-up - Fix qa script complaints

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

Bug-7981-Follow-up---Fix-qa-script-complaints.patch (text/plain), 3.47 KB, created by Jonathan Druart on 2015-06-04 11:36:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2015-06-04 11:36:53 UTC

Size: 3.47 KB

patch

obsolete

>From f1ff3e3b976079ed3219b5d97c68ca1487c3cf80 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Tue, 21 Apr 2015 11:56:16 +0200
>Subject: [PATCH] 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>
>
>Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org>
>---
> installer/data/mysql/updatedatabase.pl                  | 16 +++++++++-------
> koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt |  4 ++--
> 2 files changed, 11 insertions(+), 9 deletions(-)
>
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index de8d97e..318712b 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -8507,13 +8507,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);
> }
> 
>@@ -10511,6 +10504,15 @@ if ( CheckVersion($DBversion) ) {
>     SetVersion ($DBversion);
> }
> 
>+$DBversion = "3.21.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 a831c80..6dbbd5b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
>@@ -289,7 +289,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 %]
>@@ -297,7 +297,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 %]" />
>-- 
>2.1.0

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