Bugzilla – Attachment 166256 Details for
Bug 35169
Make long overdue patron category options configurable in interface
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35169: (QA follow-up) Fix spelling and preference name
Bug-35169-QA-follow-up-Fix-spelling-and-preference.patch (text/plain), 9.36 KB, created by
Martin Renvoize (ashimema)
on 2024-05-07 10:53:44 UTC
(
hide
)
Description:
Bug 35169: (QA follow-up) Fix spelling and preference name
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2024-05-07 10:53:44 UTC
Size:
9.36 KB
patch
obsolete
>From 782f19e416e7f94b6f967c780f8cc0be636b3d94 Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Tue, 7 May 2024 11:52:42 +0100 >Subject: [PATCH] Bug 35169: (QA follow-up) Fix spelling and preference name > >Update the preference name from 'Borrower' to 'Patron' and correct >spelling of receive. > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > installer/data/mysql/atomicupdate/bug_35169.pl | 8 ++++---- > installer/data/mysql/mandatory/sysprefs.sql | 4 ++-- > .../en/modules/admin/preferences/circulation.pref | 12 ++++++------ > misc/cronjobs/longoverdue.pl | 12 ++++++------ > 4 files changed, 18 insertions(+), 18 deletions(-) > >diff --git a/installer/data/mysql/atomicupdate/bug_35169.pl b/installer/data/mysql/atomicupdate/bug_35169.pl >index 20ed359c2a8..a3a43dd5562 100755 >--- a/installer/data/mysql/atomicupdate/bug_35169.pl >+++ b/installer/data/mysql/atomicupdate/bug_35169.pl >@@ -11,13 +11,13 @@ return { > $dbh->do( > q{ > INSERT IGNORE INTO systempreferences (variable, value, options, explanation, type) VALUES >- ('DefaultLongOverdueBorrowerCategories', '', NULL, 'Set the borrower categories that will be listed when longoverdue cronjob is executed', 'choice'), >- ('DefaultLongOverdueSkipBorrowerCategories', '', NULL, 'Set the borrower categories that will not be listed when longoverdue cronjob is executed', 'choice'); >+ ('DefaultLongOverduePatronCategories', '', NULL, 'Set the borrower categories that will be listed when longoverdue cronjob is executed', 'choice'), >+ ('DefaultLongOverdueSkipPatronCategories', '', NULL, 'Set the borrower categories that will not be listed when longoverdue cronjob is executed', 'choice'); > } > ); > > # sysprefs >- say $out "Added new system preference 'DefaultLongOverdueBorrowerCategories'"; >- say $out "Added new system preference 'DefaultLongOverdueSkipBorrowerCategories'"; >+ say $out "Added new system preference 'DefaultLongOverduePatronCategories'"; >+ say $out "Added new system preference 'DefaultLongOverdueSkipPatronCategories'"; > }, > }; >diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql >index 7ac4beb4116..2e19a1cdd86 100644 >--- a/installer/data/mysql/mandatory/sysprefs.sql >+++ b/installer/data/mysql/mandatory/sysprefs.sql >@@ -198,11 +198,11 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('DefaultHoldExpirationdateUnitOfTime','days','days|months|years','Which unit of time is used when setting the default expiration date. ','choice'), > ('DefaultHoldPickupLocation','loggedinlibrary','loggedinlibrary|homebranch|holdingbranch','Which branch should a hold pickup location default to. ','choice'), > ('DefaultLanguageField008','','','Fill in the default language for field 008 Range 35-37 of MARC21 records (e.g. eng, nor, ger, see <a href=\"http://www.loc.gov/marc/languages/language_code.html\">MARC Code List for Languages</a>)','Free'), >-('DefaultLongOverdueBorrowerCategories', '', NULL, "Set the borrower categories that will be listed when longoverdue cronjob is executed", 'choice'), >+('DefaultLongOverduePatronCategories', '', NULL, "Set the borrower categories that will be listed when longoverdue cronjob is executed", 'choice'), > ('DefaultLongOverdueChargeValue', '', NULL, "Charge a lost item to the borrower's account when the LOST value of the item changes to n.", 'integer'), > ('DefaultLongOverdueDays', '', NULL, "Set the LOST value of an item when the item has been overdue for more than n days.", 'integer'), > ('DefaultLongOverdueLostValue', '', NULL, "Set the LOST value of an item to n when the item has been overdue for more than defaultlongoverduedays days.", 'integer'), >-('DefaultLongOverdueSkipBorrowerCategories', '', NULL, "Set the borrower categories that will not be listed when longoverdue cronjob is executed", 'choice'), >+('DefaultLongOverdueSkipPatronCategories', '', NULL, "Set the borrower categories that will not be listed when longoverdue cronjob is executed", 'choice'), > ('DefaultLongOverdueSkipLostStatuses', '', NULL, 'Skip these lost statuses by default in longoverdue.pl', 'Free'), > ('DefaultPatronSearchFields', 'firstname|middle_name|surname|othernames|cardnumber|userid',NULL,'Pipe separated list defining the default fields to be used during a patron search using the "standard" option. If empty Koha will default to "firstname|surname|othernames|cardnumber|userid". Additional fields added to this preference will be added as search options in the dropdown menu on the patron search page.','free'), > ('DefaultPatronSearchMethod','starts_with','Choose which search method to use by default when searching with PatronAutoComplete','starts_with|contains','Choice'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >index 1db0437c6b1..eb3fe6bc1f0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >@@ -452,21 +452,21 @@ Circulation: > - <br>Leave this field empty if you don't want to skip any <a href="/cgi-bin/koha/admin/authorised_values.pl?searchfield=LOST">LOST</a> statuses. > - <br>Set to a list of comma separated values, e.g. <em>5,6,7</em>. > - >- - Set the default patron categories to recieve overdues to >- - pref: DefaultLongOverdueBorrowerCategories >+ - Set the default patron categories to receive overdues to >+ - pref: DefaultLongOverduePatronCategories > choices: patron-categories > class: multiple > - <br>Leave this field empty if you want to process overdues for all patron categories. > - <br>(Used when the longoverdue.pl script is called without the --category parameter) >- - <br>WARNING â This preference will be active only if DefaultLongOverdueSkipBorrowerCategories is empty. >+ - <br>WARNING â This preference will be active only if DefaultLongOverdueSkipPatronCategories is empty. > - <br> >- - Set the default patron categories to <i>not</i> recieve overdues to >- - pref: DefaultLongOverdueSkipBorrowerCategories >+ - Set the default patron categories to <i>not</i> receive overdues to >+ - pref: DefaultLongOverdueSkipPatronCategories > choices: patron-categories > class: multiple > - <br>Leave this field empty if you want to process overdues for all patron categories. > - <br>(Used when the longoverdue.pl script is called without the --skip-category parameter) >- - <br>WARNING - This preference overrides the DefaultLongOverdueBorrowerCategories preference, so the DefaultLongOverdueBorrowerCategories filter will not take effect. >+ - <br>WARNING - This preference overrides the DefaultLongOverduePatronCategories preference, so the DefaultLongOverduePatronCategories filter will not take effect. > - "<br><strong>NOTE:</strong> This system preference requires the <code>misc/cronjobs/longoverdue.pl</code> cronjob. Ask your system administrator to schedule it." > > - >diff --git a/misc/cronjobs/longoverdue.pl b/misc/cronjobs/longoverdue.pl >index 1eda9ccdc79..aa0c2ff253c 100755 >--- a/misc/cronjobs/longoverdue.pl >+++ b/misc/cronjobs/longoverdue.pl >@@ -173,14 +173,14 @@ If not provided, the value of the system preference 'MarkLostItemsAsReturned' wi > Act on the listed borrower category code (borrowers.categorycode). > Exclude all others. This may be specified multiple times to include multiple categories. > May not be used with B<--skip-category> >-If not provided, the value of the system preference 'DefaultLongOverdueBorrowerCategories' will be used. >+If not provided, the value of the system preference 'DefaultLongOverduePatronCategories' will be used. > > =item B<--skip-category> > > Act on all available borrower category codes, except those listed. > This may be specified multiple times, to exclude multiple categories. > May not be used with B<--category> >-If not provided, the value of the system preference 'DefaultLongOverdueSkipBorrowerCategories' will be used. >+If not provided, the value of the system preference 'DefaultLongOverdueSkipPatronCategories' will be used. > > =item B<--list-categories> > >@@ -279,15 +279,15 @@ if ( ! defined($charge) ) { > } > > if ( scalar @$borrower_category == 0 ) { >- if ( C4::Context->preference('DefaultLongOverdueBorrowerCategories') ) { >- my $categories = C4::Context->preference('DefaultLongOverdueBorrowerCategories'); >+ if ( C4::Context->preference('DefaultLongOverduePatronCategories') ) { >+ my $categories = C4::Context->preference('DefaultLongOverduePatronCategories'); > $borrower_category = [ split( ',', $categories ) ]; > } > } > > if ( scalar @$skip_borrower_category == 0 ) { >- if ( C4::Context->preference('DefaultLongOverdueSkipBorrowerCategories') ) { >- my $categories = C4::Context->preference('DefaultLongOverdueSkipBorrowerCategories'); >+ if ( C4::Context->preference('DefaultLongOverdueSkipPatronCategories') ) { >+ my $categories = C4::Context->preference('DefaultLongOverdueSkipPatronCategories'); > $skip_borrower_category = [ split( ',', $categories ) ]; > } > } >-- >2.45.0
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 35169
:
162340
|
162345
|
162346
|
162611
|
162667
|
162688
|
163008
|
166121
|
166122
|
166123
|
166124
|
166125
|
166126
|
166127
| 166256