Attachment 95854 Details for Bug 12446 – Bug 12446: (QA follow-up) Cleaning, and fixing, old code carried accidentally

[patch] Bug 12446: (QA follow-up) Cleaning, and fixing, old code carried accidentally

Bug-12446-QA-follow-up-Cleaning-and-fixing-old-cod.patch (text/plain), 3.14 KB, created by Maryse Simard on 2019-11-27 16:18:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maryse Simard

Created: 2019-11-27 16:18:59 UTC

Size: 3.14 KB

patch

obsolete

>From 6aad47c4fac82c25aacc78456fa373e35a004ec6 Mon Sep 17 00:00:00 2001
>From: Charles Farmer <charles.farmer@inLibro.com>
>Date: Mon, 13 Aug 2018 16:32:43 -0400
>Subject: [PATCH] Bug 12446: (QA follow-up) Cleaning, and fixing, old code
> carried accidentally
>
>Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz>
>---
> installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt       | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql b/installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql
>index 56462a7..233d765 100644
>--- a/installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql
>+++ b/installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql
>@@ -7,5 +7,5 @@ VALUES ('AdditionalGuarantorField','',NULL,'Additional fields name to be transfe
> -- ********* --
> -- STRUCTURE --
> -- ********* --
>-ALTER TABLE categories ADD COLUMN `canbeguarantee` tinyint(1) NOT NULL default '0';
>+ALTER TABLE categories ADD COLUMN `canbeguarantee` tinyint(1) NOT NULL default '0' AFTER `checkprevcheckout`;
> UPDATE categories SET canbeguarantee = 1 WHERE category_type = 'P' OR category_type = 'C';
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index b7adbbe..cf372ce 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -257,7 +257,7 @@
>                                                     <tr>
>                                                         [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
>                                                             <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | uri %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></td>
>-                                                            <td style='text-align:right'>[% guarantee.account.balance %]</td>
>+                                                            <td style='text-align:right'>[% guarantee.account.balance | html %]</td>
>                                                         [% ELSE %]
>                                                             <td>[% guarantee.firstname | html %] [% guarantee.surname | html %]</td>
>                                                         [% END %]
>@@ -265,7 +265,7 @@
>                                                     [% END %]
>                                                     [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
>                                                        <td>Total</td>
>-                                                       <td style='text-align:right'>[% amounttot %]</td>
>+                                                       <td style='text-align:right'>[% amounttot | html %]</td>
>                                                     [% END %]
>                                                 </table>
>                                             </li>
>-- 
>2.7.4

Actions: View | Diff | Splinter Review

Attachments on bug 12446: 29278 | 36176 | 39744 | 42469 | 42470 | 42535 | 46277 | 46278 | 46327 | 46328 | 46345 | 46486 | 49793 | 50953 | 53534 | 53535 | 53536 | 53913 | 60929 | 60930 | 60934 | 63148 | 63149 | 63214 | 64793 | 64794 | 64828 | 72295 | 72883 | 77766 | 77767 | 77768 | 79343 | 79344 | 79345 | 79347 | 79348 | 85069 | 88364 | 88365 | 88366 | 88367 | 90389 | 90390 | 90391 | 90392 | 90470 | 90471 | 90472 | 90473 | 93388 | 93389 | 93390 | 93391 | 93392 | 93393 | 93394 | 95411 | 95853 | 95854 | 95855 | 95856 | 95857 | 95858 | 95859 | 95860 | 106753 | 106754 | 106755 | 106756 | 106757 | 107611 | 111052 | 111053 | 111317 | 111318 | 112102 | 112160 | 112161 | 112162 | 112163 | 113583 | 121925 | 121926 | 121927 | 121928 | 121929 | 122084 | 122085 | 122086 | 122087 | 122088 | 122089 | 122090 | 122091 | 122184 | 122185 | 122186 | 122187 | 130398 | 130399 | 130400 | 130401 | 130402 | 131965 | 131966 | 131967 | 131968 | 131969 | 133691 | 133952 | 133953 | 133954 | 133955 | 133956 | 133957 | 134930 | 134931 | 134932 | 134933 | 134934 | 134935 | 134936 | 135506 | 135507 | 135508 | 135509 | 135510 | 135511 | 135512 | 135519 | 135520 | 135521 | 135522 | 135523 | 135544 | 135545 | 142401 | 142408 | 142431 | 142432 | 142433 | 142434 | 142435 | 142436 | 142437 | 142438 | 142439