Attachment 79345 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), 7.74 KB, created by Pierre-Marc Thibault on 2018-09-24 20:12:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre-Marc Thibault

Created: 2018-09-24 20:12:22 UTC

Size: 7.74 KB

patch

obsolete

>From 4732c2f75509515f875ee48c372d1e3a7d725117 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
>
>---
> installer/data/mysql/atomicupdate/bug_12446-EnableAdultGarantee.sql   | 2 +-
> installer/data/mysql/kohastructure.sql                                | 2 +-
> installer/data/mysql/sysprefs.sql                                     | 1 -
> koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt         | 4 ++--
> .../intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt  | 2 +-
> members/moremember.pl                                                 | 1 -
> 6 files changed, 5 insertions(+), 7 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/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index 57c24a2..05435db 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -304,7 +304,7 @@ CREATE TABLE `categories` ( -- this table shows information related to Koha patr
>   `hidelostitems` tinyint(1) NOT NULL default '0', -- are lost items shown to this category (1 for yes, 0 for no)
>   `category_type` varchar(1) NOT NULL default 'A', -- type of Koha patron (Adult, Child, Professional, Organizational, Statistical, Staff)
>   `BlockExpiredPatronOpacActions` tinyint(1) NOT NULL default '-1', -- wheither or not a patron of this category can renew books or place holds once their card has expired. 0 means they can, 1 means they cannot, -1 means use syspref BlockExpiredPatronOpacActions
>-  `default_privacy` ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default', -- Default privacy setting for this patron category,
>+  `default_privacy` ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default', -- Default privacy setting for this patron category
>   `checkprevcheckout` varchar(7) NOT NULL default 'inherit', -- produce a warning for this patron category if this item has previously been checked out to this patron if 'yes', not if 'no', defer to syspref setting if 'inherit'.
>   `canbeguarantee` tinyint(1) NOT NULL default '0'
>   PRIMARY KEY  (`categorycode`),
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index ef88ee8..242d5b1 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -7,7 +7,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('AcqViewBaskets','user','user|branch|all','Define which baskets a user is allowed to view: his own only, any within his branch or all','Choice'),
> ('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'),
> ('AdditionalGuarantorField','',NULL,'Additional fields name to be transfer from guarantor to guarantee.','free'),
>-('AddPatronLists','categorycode','categorycode|category_type','Allow user to choose what list to pick up from when adding patrons','Choice'),
> ('AddressFormat','us','','Choose format to display postal addresses', 'Choice'),
> ('advancedMARCeditor','0','','If ON, the MARC editor won\'t display field/subfield descriptions','YesNo'),
> ('AdvancedSearchLanguages','','','ISO 639-2 codes of languages you wish to see appear as an Advanced search option.  Example: eng|fre|ita','Textarea'),
>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 9901712..17159dc 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -234,7 +234,7 @@
>                                                     <tr>
>                                                         [% IF logged_in_user.can_see_patron_infos( guarantee ) %]
>                                                             <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | html %]">[% 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 %]
>@@ -242,7 +242,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>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
>index 6cba09c..71e068a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
>@@ -18,7 +18,7 @@
>                 "dt_address":
>                     "[% INCLUDE escape_address data=data %]",
>                 "dt_action":
>-                    "<a href=\"#\" class=\"btn btn-mini select_user\" data-borrowernumber=\"[% data.borrowernumber | html %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber | html %]\" name=\"guarantor_data\" value=\"[% To.json(data) | html %]\" /><input type=\"hidden\" id=\"guarantor_attributes\" name=\"guarantor_attributes\" value=\"[% To.json(attributes) | html %]\" />"
>+                    "<a href=\"#\" class=\"btn btn-default btn-xs select_user\" data-borrowernumber=\"[% data.borrowernumber | html %]\">Select</a><input type=\"hidden\" id=\"borrower_data[% data.borrowernumber | html %]\" name=\"guarantor_data\" value=\"[% To.json(data) | html %]\" /><input type=\"hidden\" id=\"guarantor_attributes\" name=\"guarantor_attributes\" value=\"[% To.json(attributes) | html %]\" />"
>             }[% UNLESS loop.last %],[% END %]
>         [% END %]
>     ]
>diff --git a/members/moremember.pl b/members/moremember.pl
>index 1e78a16..8d52527 100755
>--- a/members/moremember.pl
>+++ b/members/moremember.pl
>@@ -197,7 +197,6 @@ if ( $count ) {
>     $template->param( guarantees => @guarantees);
>     $template->param( amounttot => sprintf("%.2f",$totalmount));
> }
>-( $template->param( adultborrower => 1 ) ) if ( $category_type eq 'A' || $category_type eq 'I' );
> 
> if (my $guarantor = $patron->guarantor){
>     $template->param(isguarantor => 1);
>-- 
>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