@@ -, +, @@ --- 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 ++------- patroncards/members-search.pl | 4 +--- serials/member-search.pl | 7 +------ 9 files changed, 18 insertions(+), 42 deletions(-) --- a/C4/UsageStats.pm +++ a/C4/UsageStats.pm @@ -278,7 +278,6 @@ sub BuildReport { TrackClicks PatronSelfRegistration OPACShelfBrowser - AddPatronLists AutoEmailOpacUser AutoEmailPrimaryAddress autoMemberNum --- a/circ/circulation.pl +++ a/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'"; --- a/installer/data/mysql/sysprefs.sql +++ a/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'), --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -9773,6 +9773,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); +} + =head1 FUNCTIONS =head2 TableExists($table) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-toolbar.inc @@ -3,16 +3,7 @@