From 826c1e3da150eb55c467a662028452a64156b43f Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 29 Dec 2014 15:18:08 +0100 Subject: [PATCH] Bug 13497: Remove the pref AddPatronsLists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The pref AddPatronLists does not work as expected if 'generic' is selected. Indeed a patron should be linked to a valid patron category (see the constraint borrowers_ibfk_1 in the DB structure). Test plan: 0/ Confirm that the AddPatronLists does not work as expected if you choose the generic patron types. 1/ Delete all you patron categories and check that the interface invites you to create one. 2/ Confirm that you are able to create a patron and to link it to a patron category you have created. I could not verify step 1/, because at least one Patron category can not be deleted (Staff, since I'm logged in as a Staff patron and you can not delete categories that are in use). Tested 0/ and 2/ Signed-off-by: Marc VĂ©ron Signed-off-by: Katrin Fischer Passes QA script and tests. --- C4/UsageStats.pm | 1 - circ/circulation.pl | 11 ++++------- installer/data/mysql/sysprefs.sql | 1 - installer/data/mysql/updatedatabase.pl | 9 +++++++++ koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc | 11 +---------- .../prog/en/modules/admin/preferences/patrons.pref | 7 ------- members/members-home.pl | 9 ++------- 7 files changed, 16 insertions(+), 33 deletions(-) diff --git a/C4/UsageStats.pm b/C4/UsageStats.pm index 4960d51..73c2e1f 100644 --- a/C4/UsageStats.pm +++ b/C4/UsageStats.pm @@ -276,7 +276,6 @@ sub BuildReport { TrackClicks PatronSelfRegistration OPACShelfBrowser - AddPatronLists AutoEmailOpacUser AutoEmailPrimaryAddress autoMemberNum diff --git a/circ/circulation.pl b/circ/circulation.pl index 22c5e24..fa8e5b1 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -206,13 +206,10 @@ my $borrowerslist; my $message; if ($findborrower) { my $borrowers = Search($findborrower, 'cardnumber') || []; - if (C4::Context->preference("AddPatronLists")) { - if (C4::Context->preference("AddPatronLists")=~/code/){ - my $categories = GetBorrowercategoryList; - $categories->[0]->{'first'} = 1; - $template->param(categories=>$categories); - } - } + my $categories = GetBorrowercategoryList; + $categories->[0]->{first} = 1; + $template->param( categories => $categories ); + if ( @$borrowers == 0 ) { $query->param( 'findborrower', '' ); $message = "'$findborrower'"; diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 1e07e3c..878214f 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -6,7 +6,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('AcquisitionDetails', '1', '', 'Hide/Show acquisition details on the biblio detail page.', 'YesNo'), ('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'), -('AddPatronLists','categorycode','categorycode|category_type','Allow user to choose what list to pick up from when adding patrons','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'), ('AdvancedSearchTypes','itemtypes','itemtypes|ccode','Select which set of fields comprise the Type limit in the advanced search','Choice'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 5d64649..d8f7ce6 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -10009,6 +10009,15 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.19.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q| + DELETE FROM systempreferences where variable = 'AddPatronLists' + |); + print "Upgrade to $DBversion done (Bug XXXXX - Remove the AddPatronLists system preferences)\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/includes/patron-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc index 35720df..ac97003 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc @@ -3,16 +3,7 @@
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref index aa567c3..4784f27 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -1,13 +1,6 @@ Patrons: General: - - - List - - pref: AddPatronLists - choices: - categorycode: specific categories - category_type: general patron types - - under the new patron menu. - - - pref: AutoEmailOpacUser choices: yes: Send diff --git a/members/members-home.pl b/members/members-home.pl index 0d0e279..d589a9c 100755 --- a/members/members-home.pl +++ b/members/members-home.pl @@ -67,7 +67,6 @@ if ( C4::Branch::onlymine ) { } my @categories; -my $no_categories; my $no_add = 0; if(scalar(@branchloop) < 1){ $no_add = 1; @@ -78,14 +77,10 @@ else { } @categories=C4::Category->all; -if(scalar(@categories) < 1){ - $no_categories = 1; -} - -if($no_categories && C4::Context->preference("AddPatronLists")=~/code/){ +if(scalar(@categories) < 1){ $no_add = 1; $template->param(no_categories => 1); -} +} else { $template->param(categories=>\@categories); } -- 2.1.0