Attachment 139978 Details for Bug 18064 – Bug 18064: (follow-up) Remove statement for summary & reorder sysprefs

[patch] Bug 18064: (follow-up) Remove statement for summary & reorder sysprefs

Bug-18064-follow-up-Remove-statement-for-summary--.patch (text/plain), 3.77 KB, created by Thibaud Guillot (thibaud_g) on 2022-08-30 10:27:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thibaud Guillot (thibaud_g)

Created: 2022-08-30 10:27:20 UTC

Size: 3.77 KB

patch

obsolete

>From 0ff11bda8c2a4fcc1269ed0b3adfbbb310ca3adb Mon Sep 17 00:00:00 2001
>From: Thibaud Guillot <thibaud.guillot@biblibre.com>
>Date: Tue, 30 Aug 2022 12:24:26 +0200
>Subject: [PATCH] Bug 18064: (follow-up) Remove statement for summary & reorder
> sysprefs
>
>---
> installer/data/mysql/mandatory/sysprefs.sql | 5 +----
> misc/cronjobs/longoverdue.pl                | 5 ++---
> 2 files changed, 3 insertions(+), 7 deletions(-)
>
>diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
>index 4596f5a89b..8d76b7780b 100644
>--- a/installer/data/mysql/mandatory/sysprefs.sql
>+++ b/installer/data/mysql/mandatory/sysprefs.sql
>@@ -339,6 +339,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('LocalHoldsPriorityItemControl',  'holdingbranch',  'holdingbranch|homebranch',  'decides if the feature operates using the item''s home or holding library.',  'Choice'),
> ('LocalHoldsPriorityPatronControl',  'PickupLibrary',  'HomeLibrary|PickupLibrary',  'decides if the feature operates using the library set as the patron''s home library, or the library set as the pickup library for the given hold.',  'Choice'),
> ('LockExpiredDelay','','','Delay for locking expired patrons (empty means no locking)','Integer'),
>+('LongOverdueNoticeCalendar',0,NULL,'Take the calendar into consideration when generating long overdue notices','YesNo'),
> ('makePreviousSerialAvailable','0','','make previous serial automatically available when collecting a new serial. Please note that the item-level_itypes syspref must be set to specific item.','YesNo'),
> ('Mana','2',NULL,'request to Mana Webservice. Mana centralize common information between other Koha to facilitate the creation of new subscriptions, vendors, report queries etc... You can search, share, import and comment the content of Mana.','Choice'),
> ('ManInvInNoissuesCharge','1',NULL,'MANUAL_INV charges block checkouts (added to noissuescharge).','YesNo'),
>@@ -527,11 +528,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('OverDrivePasswordRequired','0',NULL,'Does the library require passwords for OverDrive SIP authentication','YesNo'),
> ('OverDriveUsername','cardnumber','cardnumber|userid','Which patron information should be passed as OverDrive username','Choice'),
> ('OverdueNoticeCalendar',0,NULL,'Take the calendar into consideration when generating overdue notices','YesNo'),
>-<<<<<<< HEAD
> ('OverdueNoticeFrom', 'cron', 'cron|item-issuebranch|item-homebranch', 'Organize and send overdue notices by item home library or checkout library', 'Choice'),
>-=======
>-('LongOverdueNoticeCalendar',0,NULL,'Take the calendar into consideration when generating long overdue notices','YesNo'),
>->>>>>>> Bug 18064 : Add syspref to launch longOverdue script with calendar support
> ('OverduesBlockCirc','noblock','noblock|confirmation|block','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','Choice'),
> ('OverduesBlockRenewing','allow','allow|blockitem|block','If any of patron checked out documents is late, should renewal be allowed, blocked only on overdue items or blocked on whatever checked out document','Choice'),
> ('PassItemMarcToXSLT','0',NULL,'If enabled, item fields in the MARC record will be made avaiable to XSLT sheets. Otherwise they will be removed.','YesNo'),
>diff --git a/misc/cronjobs/longoverdue.pl b/misc/cronjobs/longoverdue.pl
>index bbc263c528..44cba375f8 100755
>--- a/misc/cronjobs/longoverdue.pl
>+++ b/misc/cronjobs/longoverdue.pl
>@@ -493,10 +493,9 @@ sub summarize {
>     }
> }
> 
>-if (!( C4::Context->preference( 'LongOverdueNoticeCalendar' ) )) {
>-    if (!$quiet){
>+if (!$quiet){
>         print "\n### LONGOVERDUE SUMMARY ###";
>         summarize (\@report, 1);
>         print "\nTOTAL: $total items\n";
>-    }
> }
>+
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 18064: 130363 | 135888 | 136213 | 136214 | 136263 | 139978 | 145920 | 147496 | 147497 | 159088