From 66fd3f7da6580d5bbe875150188f4c7d2aa51e93 Mon Sep 17 00:00:00 2001 From: Caroline Cyr La Rose Date: Fri, 3 Aug 2018 16:03:10 -0400 Subject: [PATCH] Bug 21158: Add cronjob references to the system preference descriptions if a cronjob is required This patch adds references to cronjobs in the description of some system preferences. The following system preference description were modified: - StaticHoldsQueueWeight - ExpireReservesMaxPickUpDelay - AutoResumeSuspendedHolds - finesMode - DefaultLongOverdueLostValue - DefaultLongOverdueChargeValue - PatronSelfRegistrationExpireTemporaryAccountsDelay - PatronSelfRegistrationVerifyByEmail - EnhancedMessagingPreferences - NewItemsDefaultLocation - InProcessingToShelvingCart - ReturnToShelvingCart - ReturnToShelvingCart - AuthorityMergeLimit - OpacBrowser - OpacCloud - UsageStats - PurgeSuggestionsOlderThan - MembershipExpiryDaysNotice To test, check the above mentioned system preferences to make sure the sentence is there and it is correct. Followed test plan and patch is as described Signed-off-by: Alex Buckley Signed-off-by: Katrin Fischer https://bugs.koha-community.org/show_bug.cgi?id=12258 Signed-off-by: Nick Clemens (cherry picked from commit 380f1dcbf8d3b8e65a733cc3174b9d0c0a46ab7d) Signed-off-by: Martin Renvoize --- .../admin/preferences/acquisitions.pref | 7 +++---- .../en/modules/admin/preferences/admin.pref | 16 +++++++++------- .../admin/preferences/authorities.pref | 1 + .../admin/preferences/cataloguing.pref | 1 + .../admin/preferences/circulation.pref | 19 +++++++++++++------ .../en/modules/admin/preferences/opac.pref | 11 ++++++++--- .../en/modules/admin/preferences/patrons.pref | 17 ++++++++++++----- 7 files changed, 47 insertions(+), 25 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref index bf5d4bb6bd..cf9209d068 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref @@ -80,10 +80,9 @@ Acquisitions: - Keep accepted or rejected purchase suggestions for a period of - pref: PurgeSuggestionsOlderThan class: integer - - days. - -
WARNING - Leave this field empty if you don't want to activate this automatic feature. - - "
Example: [30] Sets purgation of suggestions for those older than 30 days." - -
(Used when the cronjob purge_suggestions.pl is active and called without a specific number of days) + - "days. Example: [30] Sets purgation of suggestions for those older than 30 days." + - "
WARNING: Leave this field empty if you don't want to activate this automatic feature." + - "
NOTE: This system preference requires the misc/cronjobs/purge_suggestions.pl cronjob. Ask you system administrator to schedule it." - - pref: UseACQFrameworkForBiblioRecords diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref index 2e8dce78da..da2a1f831f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref @@ -176,12 +176,14 @@ Administration: choices: yes: "Yes" no: "No" - - "You have to run misc/cronjobs/share_usage_with_koha_community.pl in a cronjob. Note that the other \"UsageStats\" preferences have no effect if this preference is set to \"No\". Website where usage statistics are published: Hea Koha community website." + - ". Website where usage statistics are published: Hea Koha community website." + - "
NOTE: The other \"UsageStats\" preferences have no effect if this preference is set to \"No\"." + - "
NOTE: This system preference requires the misc/cronjobs/share_usage_with_koha_community.pl cronjob. Ask you system administrator to schedule it." - - "Use the following library name to be shown on the Hea Community website: " - pref: UsageStatsLibraryName - If this field is empty data will be sent anonymously. - - Note that this value has no effect if the UsageStats system preference is set to "Don't share" + - "
NOTE: This value has no effect if the UsageStats system preference is set to \"Don't share\"." - - "The country where your library is located to be shown on the Hea Community website: " - pref: UsageStatsCountry @@ -384,11 +386,11 @@ Administration: Zimbabwe : "Zimbabwe" - This will be shown on the Hea Koha community website. - - Note that this value has no effect if the UsageStats system preference is set to "Don't share" + - "
NOTE: This value has no effect if the UsageStats system preference is set to \"Don't share\"." - - "The library URL to be shown on the Hea Community website: " - pref: UsageStatsLibraryUrl - - Note that this value has no effect if the UsageStats system preference is set to "Don't share" + - "
NOTE: This value has no effect if the UsageStats system preference is set to \"Don't share\"." - - "The library type to be shown on the Hea Community website: " - pref: UsageStatsLibraryType @@ -405,18 +407,18 @@ Administration: government : "government" religiousOrg: "religious organization" subscription: "subscription" - - Note that this value has no effect if the UsageStats system preference is set to "Don't share" + - "
NOTE: This value has no effect if the UsageStats system preference is set to \"Don't share\"." - - pref: UsageStatsLibrariesInfo choices: yes: "Share" no: "Do not Share" - "libraries information (name, url, country)" - - Note that this value has no effect if the UsageStats system preference is set to "Don't share" + - "
NOTE: This value has no effect if the UsageStats system preference is set to \"Don't share\"." - - "Geolocation of the main library: " - pref: UsageStatsGeolocation - - Note that this value has no effect if the UsageStats system preference is set to "Don't share" + - "
NOTE: This value has no effect if the UsageStats system preference is set to \"Don't share\"." Search Engine: - - "Use following search engine: " diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref index be480cbe95..5041f88490 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref @@ -35,6 +35,7 @@ Authorities: - pref: AuthorityMergeLimit default: 50 - records. (Above this limit, the merge_authority cron job will merge them.) + - "
NOTE: This system preference requires the misc/migration_tools/merge_authority.pl cronjob. Ask you system administrator to schedule it." - - Use the following text for the contents of MARC21 authority control field 008 position 06-39 (fixed length data elements). Do NOT include the date (position 00-05). - pref: MARCAuthorityControlField008 diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref index cc75b6dfb4..f90e671aef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref @@ -90,6 +90,7 @@ Cataloging: - pref: NewItemsDefaultLocation class: short - (should be a location code, or blank to disable). + - "
NOTE: This system preference requires the misc/cronjobs/cart_to_shelf.pl cronjob. Ask you system administrator to schedule it." - - pref: z3950NormalizeAuthor choices: 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 86cee1f35a..5d5f3ef78f 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 @@ -144,7 +144,7 @@ Circulation: choices: yes: Enable no: "Do not enable" - - "offline circulation on regular circulation computers. (NOTE: This system preference does not affect the Firefox plugin or the desktop application)" + - "offline circulation on regular circulation computers. (NOTE: This system preference does not affect the Firefox plugin or the desktop application)" - - pref: ShowAllCheckins choices: @@ -213,12 +213,14 @@ Circulation: yes: Move no: "Don't move" - items that have the location PROC to the location CART when they are checked in. + - "
NOTE: This system preference requires the misc/cronjobs/cart_to_shelf.pl cronjob. Ask you system administrator to schedule it." - - pref: ReturnToShelvingCart choices: yes: Move no: "Don't move" - all items to the location CART when they are checked in. + - "
NOTE: This system preference requires the misc/cronjobs/cart_to_shelf.pl cronjob. Ask you system administrator to schedule it." - - pref: AutomaticItemReturn choices: @@ -398,12 +400,14 @@ Circulation: -
WARNING — These preferences will activate the automatic item loss process. Leave these fields empty if you don't want to activate this feature. - "
Example: [1] [30] Sets an item to the LOST value 1 when it has been overdue for more than 30 days." -
(Used when the longoverdue.pl script is called without the --lost parameter) + - "
NOTE: This system preference requires the misc/cronjobs/longoverdue.pl cronjob. Ask you system administrator to schedule it." - - "Charge a lost item to the borrower's account when the LOST value of the item changes to :" - pref: DefaultLongOverdueChargeValue class: integer -
Leave this field empty if you don't want to charge the user for lost items. -
(Used when the longoverdue.pl script is called without the --charge parameter) + - "
NOTE: This system preference requires the misc/cronjobs/longoverdue.pl cronjob. Ask you system administrator to schedule it." - - "When issuing an item that has been marked as lost, " - pref: IssueLostItem @@ -427,7 +431,7 @@ Circulation: choices: yes: Allow no: "Don't allow" - - "patrons to check out multiple items from the same record. (NOTE: This will only affect records without a subscription attached.)" + - "patrons to check out multiple items from the same record. (NOTE: This will only affect records without a subscription attached.)" - - pref: OnSiteCheckouts choices: @@ -495,7 +499,7 @@ Circulation: yes: Do no: "Don't" - calculate and update overdue charges when an item is returned. - -
NOTE If you are doing hourly loans then you should have this on. + - "
NOTE: If you are doing hourly loans then you should have this on." - - pref: UpdateNotForLoanStatusOnCheckin type: textarea @@ -568,7 +572,7 @@ Circulation: choices: yes: Allow no: "Don't allow" - - "holds to expire automatically if they have not been picked by within the time period specified in ReservesMaxPickUpDelay" + - "holds to expire automatically if they have not been picked by within the time period specified in ReservesMaxPickUpDelay.
NOTE: This system preference requires the misc/cronjobs/holds/cancel_expired_holds.pl cronjob. Ask you system administrator to schedule it." - - If using ExpireReservesMaxPickUpDelay, charge a borrower who allows his or her waiting hold to expire a fee of - pref: ExpireReservesMaxPickUpDelayCharge @@ -587,6 +591,7 @@ Circulation: choices: yes: in random order. no: in that order. + - "
NOTE: This system preference requires the misc/cronjobs/holds/build_holds_queue.pl cronjob. Ask you system administrator to schedule it." - - - pref: canreservefromotherbranches @@ -634,7 +639,8 @@ Circulation: choices: yes: Allow no: "Don't allow" - - suspended holds to be automatically resumed by a set date. + - "suspended holds to be automatically resumed by a set date." + - "
NOTE: This system preference requires the misc/cronjobs/holds/auto_unsuspend_holds.pl cronjob. Ask you system administrator to schedule it." - - pref: SuspendHoldsIntranet choices: @@ -756,7 +762,8 @@ Circulation: test: Calculate (but only for mailing to the admin) production: Calculate and charge - fines (when misc/cronjobs/fines.pl is being run). - -
Note: Fines can also be charged by the CalculateFinesOnReturn system preference. + - "
NOTE: Fines can also be charged by the CalculateFinesOnReturn system preference." + - "
NOTE: This system preference requires the misc/cronjobs/fines.pl cronjob. Ask you system administrator to schedule it." - - If a lost item is returned, apply the refunding rules defined in the - pref: RefundLostOnReturnControl diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index f46dda3948..85e3eb1fdd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -396,13 +396,15 @@ OPAC: choices: yes: Allow no: "Don't allow" - - patrons to browse subject authorities on OPAC (run misc/cronjobs/build_browser_and_cloud.pl to create the browser list) + - patrons to browse subject authorities on OPAC + - "
NOTE: This system preference requires the misc/cronjobs/build_browser_and_cloud.pl cronjob. Ask you system administrator to schedule it." - - pref: OpacCloud choices: yes: Show no: "Don't show" - - a subject cloud on OPAC (run misc/cronjobs/build_browser_and_cloud.pl to build) + - a subject cloud on OPAC + - "
NOTE: This system preference requires the misc/cronjobs/build_browser_and_cloud.pl cronjob. Ask you system administrator to schedule it." - - pref: OpacAuthorities choices: @@ -718,13 +720,15 @@ OPAC: choices: yes: Allow no: "Don't allow" - - "library patrons to register or modify their account via the OPAC. Note: This needs PatronSelfRegistrationDefaultCategory to be set to a valid patron category code." + - "library patrons to register or modify their account via the OPAC." + - "
NOTE: This needs PatronSelfRegistrationDefaultCategory to be set to a valid patron category code." - - pref: PatronSelfRegistrationVerifyByEmail choices: yes: Require no: "Don't require" - "that a self-registering patron verify his or herself via email." + - "
NOTE: This system preference requires the misc/cronjobs/delete_unverified_opac_registrations.pl cronjob. Ask you system administrator to schedule it." - - "Use the patron category code" - pref: PatronSelfRegistrationDefaultCategory @@ -735,6 +739,7 @@ OPAC: - pref: PatronSelfRegistrationExpireTemporaryAccountsDelay class: integer - "days." + - "
NOTE: This system preference requires the misc/cronjobs/delete_expired_opac_registrations.pl cronjob. Ask you system administrator to schedule it." - - "The following database columns must be filled in on the patron entry screen:" - pref: PatronSelfRegistrationBorrowerMandatoryField 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 394516544a..f292aaf3e9 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 @@ -23,13 +23,13 @@ Patrons: yes: Do no: "Don't" - default the card number field on the patron addition screen to the next available card number (for example, if the largest currently used card number is 26345000012941, then this field will default to 26345000012942). - - "NOTE: If autoMemberNum is enabled, the system preference BorrowerMandatoryField must not contain the field cardnumber." + - "NOTE: If autoMemberNum is enabled, the system preference BorrowerMandatoryField must not contain the field cardnumber." - - "The following database columns must be filled in on the patron entry screen:" - pref: BorrowerMandatoryField class: multi - (separate columns with |) - - "NOTE: If autoMemberNum is enabled, the system preference BorrowerMandatoryField must not contain the field cardnumber." + - "NOTE: If autoMemberNum is enabled, the system preference BorrowerMandatoryField must not contain the field cardnumber." - - "The following database columns will not appear on the patron entry screen:" - pref: BorrowerUnwantedField @@ -59,7 +59,9 @@ Patrons: choices: yes: Allow no: "Don't allow" - - "Staff to manage which notices patrons will receive and when they will receive them. Note: this only applies to courtesy notices. To manage if patrons have also access to these settings, use EnhancedMessagingPreferencesOPAC." + - "Staff to manage which notices patrons will receive and when they will receive them." + - "
NOTE: This only applies to courtesy notices. To manage if patrons have also access to these settings, use EnhancedMessagingPreferencesOPAC." + - "
NOTE: This system preference requires the misc/cronjobs/process_message_queue.pl and the misc/cronjobs/advance_notices.pl cronjob. Ask you system administrator to schedule them." - - pref: ExtendedPatronAttributes choices: @@ -100,6 +102,7 @@ Patrons: - pref: MembershipExpiryDaysNotice class: integer - days. + - "
NOTE: This system preference requires the misc/cronjobs/membership_expiry.pl cronjob. Ask you system administrator to schedule it." - - pref: patronimages choices: @@ -188,7 +191,8 @@ Patrons: choices: yes: Show no: "Don't show" - - "patron messaging setting on the OPAC (note: EnhancedMessagingPreferences must be enabled)." + - "patron messaging setting on the OPAC." + - "
NOTE: EnhancedMessagingPreferences must be enabled." - - pref: TrackLastPatronActivity choices: @@ -206,7 +210,8 @@ Patrons: choices: yes: Allow only superlibrarians no: Allow all permitted users - - "to access/change superlibrarian privileges. Note: A permitted user needs to have the 'permissions' flag (if no superlibrarian)." + - "to access/change superlibrarian privileges." + - "
NOTE: A permitted user needs to have the 'permissions' flag (if no superlibrarian)." "Norwegian patron database": - @@ -217,6 +222,8 @@ Patrons: - the ability to communicate with the Norwegian national patron database via the - pref: NorwegianPatronDBEndpoint - endpoint. + + Privacy: - - Communicate with the Norwegian national patron database using the username - pref: NorwegianPatronDBUsername -- 2.39.5