Attachment 167663 Details for Bug 36330 – Bug 36330: Change 'reseve' to 'reserve'

[patch] Bug 36330: Change 'reseve' to 'reserve'

Bug-36330-Change-reseve-to-reserve.patch (text/plain), 5.10 KB, created by Matt Blenkinsop on 2024-06-12 14:04:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Blenkinsop

Created: 2024-06-12 14:04:07 UTC

Size: 5.10 KB

patch

obsolete

>From 215868ae3ea05e1b98a3f97353f94c42c0bccef9 Mon Sep 17 00:00:00 2001
>From: Alex Buckley <alexbuckley@catalyst.net.nz>
>Date: Thu, 21 Mar 2024 23:49:09 +0000
>Subject: [PATCH] Bug 36330: Change 'reseve' to 'reserve'
>
>Test plan:
>1. git grep 'reseve'. Notice there are instances of 'reseve'
>2. Apply patch
>3. Repeat step 1, there should be no instances of 'reseve'
>
>Sponsored-by: Catalyst IT, New Zealand
>Signed-off-by: David Nind <david@davidnind.com>
>Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
>---
> Koha/Schema/Result/CourseItem.pm            | 4 ++--
> installer/data/mysql/kohastructure.sql      | 4 ++--
> installer/data/mysql/updatedatabase.pl      | 2 +-
> misc/cronjobs/holds/cancel_expired_holds.pl | 2 +-
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/Koha/Schema/Result/CourseItem.pm b/Koha/Schema/Result/CourseItem.pm
>index 53a62686e4..435c2db64e 100644
>--- a/Koha/Schema/Result/CourseItem.pm
>+++ b/Koha/Schema/Result/CourseItem.pm
>@@ -152,7 +152,7 @@ a place to store the holdingbranch when item is on course reserve
>   is_nullable: 1
>   size: 80
> 
>-new shelving location for the item to have while on reseve (optional)
>+new shelving location for the item to have while on reserve (optional)
> 
> =head2 location_enabled
> 
>@@ -177,7 +177,7 @@ a place to store the location when the item is on course reserve
>   extra: {list => ["yes","no"]}
>   is_nullable: 0
> 
>-if at least one enabled course has this item on reseve, this field will be 'yes', otherwise it will be 'no'
>+if at least one enabled course has this item on reserve, this field will be 'yes', otherwise it will be 'no'
> 
> =head2 timestamp
> 
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index 7afeabffc0..14cef909b3 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -2239,10 +2239,10 @@ CREATE TABLE `course_items` (
>   `holdingbranch` varchar(10) DEFAULT NULL COMMENT 'new holding branch for the item to have while on reserve (optional)',
>   `holdingbranch_enabled` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'indicates if itype should be changed while on course reserve',
>   `holdingbranch_storage` varchar(10) DEFAULT NULL COMMENT 'a place to store the holdingbranch when item is on course reserve',
>-  `location` varchar(80) DEFAULT NULL COMMENT 'new shelving location for the item to have while on reseve (optional)',
>+  `location` varchar(80) DEFAULT NULL COMMENT 'new shelving location for the item to have while on reserve (optional)',
>   `location_enabled` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'indicates if itype should be changed while on course reserve',
>   `location_storage` varchar(80) DEFAULT NULL COMMENT 'a place to store the location when the item is on course reserve',
>-  `enabled` enum('yes','no') NOT NULL DEFAULT 'no' COMMENT 'if at least one enabled course has this item on reseve, this field will be ''yes'', otherwise it will be ''no''',
>+  `enabled` enum('yes','no') NOT NULL DEFAULT 'no' COMMENT 'if at least one enabled course has this item on reserve, this field will be ''yes'', otherwise it will be ''no''',
>   `timestamp` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
>   PRIMARY KEY (`ci_id`),
>   UNIQUE KEY `itemnumber` (`itemnumber`),
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index b8f2babbdd..722ad7f3e9 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -4904,7 +4904,7 @@ $DBversion = "3.07.00.024";
> if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
>     $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ExpireReservesMaxPickUpDelayCharge', '0', NULL , 'If ExpireReservesMaxPickUpDelay is enabled, and this field has a non-zero value, than a borrower whose waiting hold has expired will be charged this amount.',  'free')");
>     $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('ExpireReservesMaxPickUpDelay', '0', '', 'Enabling this allows holds to expire automatically if they have not been picked by within the time period specified in ReservesMaxPickUpDelay', 'YesNo')");
>-    print "Upgrade to $DBversion done (Added system preference ExpireReservesMaxPickUpDelay, system preference ExpireReservesMaxPickUpDelayCharge, add reseves.charge_if_expired)\n";
>+    print "Upgrade to $DBversion done (Added system preference ExpireReservesMaxPickUpDelay, system preference ExpireReservesMaxPickUpDelayCharge, add reserves.charge_if_expired)\n";
> }
> 
> $DBversion = "3.07.00.025";
>diff --git a/misc/cronjobs/holds/cancel_expired_holds.pl b/misc/cronjobs/holds/cancel_expired_holds.pl
>index 5d7de4cbee..ed977678b7 100755
>--- a/misc/cronjobs/holds/cancel_expired_holds.pl
>+++ b/misc/cronjobs/holds/cancel_expired_holds.pl
>@@ -34,7 +34,7 @@ or, in crontab:
> 
> =head1 DESCRIPTION
> 
>-This script calls C4::Reserves::CancelExpiredReserves which will find and cancel all expired reseves in the system.
>+This script calls C4::Reserves::CancelExpiredReserves which will find and cancel all expired reserves in the system.
> 
> =cut
> 
>-- 
>2.39.3 (Apple Git-146)

Actions: View | Diff | Splinter Review

Attachments on bug 36330: 163655 | 163656 | 163718 | 167543 | 167591 | 167600 | 167663 | 167664