Attachment 34413 Details for Bug 10753 – Bug 10753: Any library is represented by an empty string

[patch] Bug 10753: Any library is represented by an empty string

0001-Bug-10753-Any-library-is-represented-by-an-empty-str.patch (text/plain), 2.54 KB, created by Paola Rossi on 2014-12-15 11:39:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paola Rossi

Created: 2014-12-15 11:39:57 UTC

Size: 2.54 KB

patch

obsolete

>From 02cc1e04bc2a0aef41d0ee19480db7db746b877d Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Thu, 11 Dec 2014 12:07:17 +0100
>Subject: [PATCH] Bug 10753: Any library is represented by an empty string
>
>And not with "__ANY__"
>
>Test plan:
>0/ Don't apply this patch
>1/ Create a suggestion for "any library"
>2/ Verify suggestions.branchcode contain "__ANY__"
>3/ Apply this patch and execute the updatedb entry
>4/ Create a suggestion for "any library"
>5/ Verify suggestions.branchcode contain "" (for both suggestions).
>
>Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
>---
> installer/data/mysql/updatedatabase.pl                        |    9 +++++++++
> .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tt    |    2 +-
> 2 files changed, 10 insertions(+), 1 deletion(-)
>
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index cf17e0b..40e9e12 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -9585,6 +9585,15 @@ if ( CheckVersion($DBversion) ) {
>     SetVersion ($DBversion);
> }
> 
>+$DBversion = "3.19.00.XXX";
>+if ( CheckVersion($DBversion) ) {
>+    $dbh->do(q|
>+        UPDATE suggestions SET branchcode="" WHERE branchcode="__ANY__"
>+    |);
>+    print "upgrade to $DBversion done (Bug 10753: replace __ANY__ with empty string in suggestions.branchcode)\n";
>+    SetVersion ($DBversion);
>+}
>+
> =head1 FUNCTIONS
> 
> =head2 TableExists($table)
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>index bfe0198..9693c79 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
>@@ -418,7 +418,7 @@ h4.local_collapse a { font-size : 80%; text-decoration: none; } fieldset.brief o
>     <fieldset class="rows"> <legend>Acquisition information</legend><ol>
>         <li><label for="branchcode">Library:</label>
>             <select name="branchcode" id="branchcode">
>-                <option value="__ANY__">Any</option>[% FOREACH branchloo IN branchloop %]
>+                <option value="">Any</option>[% FOREACH branchloo IN branchloop %]
>                 [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>[% ELSE %]<option value="[% branchloo.value %]">[% branchloo.branchname %]</option>[% END %][% END %]
>             </select>
>         </li>
>-- 
>1.7.10.4
>

Actions: View | Diff | Splinter Review

Attachments on bug 10753: 34307 | 34412 | 34413 | 34538