From 034e7e1d7e4a7eee5dcf335e2090da5bacfca4fc Mon Sep 17 00:00:00 2001 From: Charles Farmer 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 9db1a4b..4ed679b 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -316,7 +316,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'. `reset_password` TINYINT(1) NULL DEFAULT NULL, -- if patrons of this category can do the password reset flow, `change_password` TINYINT(1) NULL DEFAULT NULL, -- if patrons of this category can change their passwords in the OAPC diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 8ac7037..455bfb0 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -9,7 +9,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('AcqWarnOnDuplicateInvoice','0','','Warn librarians when they try to create a duplicate invoice','YesNo'), ('AdditionalFieldsInZ3950ResultSearch', '', NULL, 'Determines which MARC field/subfields are displayed in -Additional field- column in the result of a search Z3950', 'Free'), ('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'), ('AdlibrisCoversEnabled','0',NULL,'Display cover images in OPAC results and detail listing from Swedish retailer Adlibris.','YesNo'), ('AdlibrisCoversURL','http://www.adlibris.com/se/organisationer/showimagesafe.aspx',NULL,'Base URL for Adlibris cover image web service.','Free'), 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 90fe0c5..c99592d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -250,7 +250,7 @@ [% IF logged_in_user.can_see_patron_infos( guarantee ) %] [% guarantee.firstname | html %] [% guarantee.surname | html %] - [% guarantee.account.balance %] + [% guarantee.account.balance | html %] [% ELSE %] [% guarantee.firstname | html %] [% guarantee.surname | html %] [% END %] @@ -258,7 +258,7 @@ [% END %] [% IF logged_in_user.can_see_patron_infos( guarantee ) %] Total - [% amounttot %] + [% amounttot | html %] [% END %] 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": - "Select" + "Select" }[% UNLESS loop.last %],[% END %] [% END %] ] diff --git a/members/moremember.pl b/members/moremember.pl index 96ed91e..c104bf8 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