gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Martin Renvoize 2024-05-07 11:52:42 +01:00 committed by Katrin Fischer
parent ab438e7023
commit 7dd3fc3cef
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
installer/data/mysql/atomicupdate/bug_35169.pl
View File

@ -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'";
},
};

4
installer/data/mysql/mandatory/sysprefs.sql
View File

@ -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'),

12
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
View File

@ -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."
-

12
misc/cronjobs/longoverdue.pl
View File

@ -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 ) ];
}
}