| Summary: | Fix typo: reseve | ||
|---|---|---|---|
| Product: | Koha | Reporter: | Magnus Enger <magnus> |
| Component: | Architecture, internals, and plumbing | Assignee: | Alex Buckley <alexbuckley> |
| Status: | RESOLVED FIXED | QA Contact: | Testopia <testopia> |
| Severity: | trivial | ||
| Priority: | P5 - low | CC: | alexbuckley, david, lucas, m.de.rooy |
| Version: | Main | Keywords: | Academy |
| Hardware: | All | ||
| OS: | All | ||
| Change sponsored?: | --- | Patch complexity: | --- |
| Documentation contact: | Documentation submission: | ||
| Text to go in the release notes: |
This fixes the spelling of "reserve" in Koha source code comments (was spelled incorrectly as "reseve").
|
Version(s) released in: |
24.11.00
|
| Circulation function: | |||
| Attachments: |
Bug 36330: Change 'reseve' to 'reserve'
Bug 36330: Change 'reseve' to 'reserve' Bug 36330: Change 'reseve' to 'reserve' Bug 36330: Follow up, change comments in the DB Bug 36330: Follow up, change comments in the DB Bug 36330: Follow up, change comments in the DB Bug 36330: Change 'reseve' to 'reserve' Bug 36330: Follow up, change comments in the DB |
||
Created attachment 163655 [details] [review] 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 Created attachment 163656 [details] [review] 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 Created attachment 163718 [details] [review] 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> 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) This is not allowed. You should provide a dbrev to update the tables for the adjusted comments in kohastructure. After that provide a DBIx schema update patch or leave it to the RM. Created attachment 167543 [details] [review] Bug 36330: Follow up, change comments in the DB This patch updates the comments of course_items.location and course_items.enabled to say "reserve" instead of "reseve". To test in ktd: - sudo koha-mysql kohadev - Run: "SHOW CREATE TABLE course_items;" - Verify the comments of "location" and "enabled" contains "reseve" instead of "reserve" - Make a note of the definitions of these two columns - Run the atomicupdate: "sudo koha-upgrade-schema kohadev" - Log into the database again and run the same command as above - Verify the comments now say "reserve" instead of "reseve" - Make sure the column definitions are otherwise identical to the ones you saw before the upgrade. Only the spelling of "reserve" in the comment should be changed. First patch is signed off, I have provided a followup that updates the comments in the database. Created attachment 167591 [details] [review] Bug 36330: Follow up, change comments in the DB This patch updates the comments of course_items.location and course_items.enabled to say "reserve" instead of "reseve". To test in ktd: - sudo koha-mysql kohadev - Run: "SHOW CREATE TABLE course_items;" - Verify the comments of "location" and "enabled" contains "reseve" instead of "reserve" - Make a note of the definitions of these two columns - Run the atomicupdate: "sudo koha-upgrade-schema kohadev" - Log into the database again and run the same command as above - Verify the comments now say "reserve" instead of "reseve" - Make sure the column definitions are otherwise identical to the ones you saw before the upgrade. Only the spelling of "reserve" in the comment should be changed. Signed-off-by: David Nind <david@davidnind.com> (In reply to Magnus Enger from comment #6) > First patch is signed off, I have provided a followup that updates the > comments in the database. Now signed off. I did notice an extra line with "0E0" for the database update - not sure if this is an issue or not: updatedatabase DEV atomic update /kohadevbox/koha/installer/data/mysql/atomicupdate/bug36330-fix-typo-reseve.pl [23:38:45]: Bug 36330 - Fix typo 'reseve' in COMMENTs for table course_items 0E0 Comment for course_items.location was updated. Comment for course_items.enabled was updated. Created attachment 167600 [details] [review] Bug 36330: Follow up, change comments in the DB This patch updates the comments of course_items.location and course_items.enabled to say "reserve" instead of "reseve". To test in ktd: - sudo koha-mysql kohadev - Run: "SHOW CREATE TABLE course_items;" - Verify the comments of "location" and "enabled" contains "reseve" instead of "reserve" - Make a note of the definitions of these two columns - Run the atomicupdate: "sudo koha-upgrade-schema kohadev" - Log into the database again and run the same command as above - Verify the comments now say "reserve" instead of "reseve" - Make sure the column definitions are otherwise identical to the ones you saw before the upgrade. Only the spelling of "reserve" in the comment should be changed. Signed-off-by: David Nind <david@davidnind.com> Removed unnecessary line of debug output. 2024-06-10 Magnus Enger (In reply to David Nind from comment #8) > (In reply to Magnus Enger from comment #6) > > First patch is signed off, I have provided a followup that updates the > > comments in the database. > > Now signed off. > > I did notice an extra line with "0E0" for the database update - not sure if > this is an issue or not: > > updatedatabase > DEV atomic update > /kohadevbox/koha/installer/data/mysql/atomicupdate/bug36330-fix-typo-reseve. > pl [23:38:45]: Bug 36330 - Fix typo 'reseve' in COMMENTs for table > course_items > 0E0 > Comment for course_items.location was updated. > Comment for course_items.enabled was updated. That line was left over from testing, sorry about that. I have updated the signed off patch and removed that line. Hope that is OK. Thanks Magnus! Created attachment 167663 [details] [review] 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> Created attachment 167664 [details] [review] Bug 36330: Follow up, change comments in the DB This patch updates the comments of course_items.location and course_items.enabled to say "reserve" instead of "reseve". To test in ktd: - sudo koha-mysql kohadev - Run: "SHOW CREATE TABLE course_items;" - Verify the comments of "location" and "enabled" contains "reseve" instead of "reserve" - Make a note of the definitions of these two columns - Run the atomicupdate: "sudo koha-upgrade-schema kohadev" - Log into the database again and run the same command as above - Verify the comments now say "reserve" instead of "reseve" - Make sure the column definitions are otherwise identical to the ones you saw before the upgrade. Only the spelling of "reserve" in the comment should be changed. Signed-off-by: David Nind <david@davidnind.com> Removed unnecessary line of debug output. 2024-06-10 Magnus Enger Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> Thanks for all the hard work! Pushed to main for the next 24.11.00 release as RM Assistant |
$ grep -rn "reseves" * installer/data/mysql/updatedatabase.pl:4907: print "Upgrade to $DBversion done (Added system preference ExpireReservesMaxPickUpDelay, system preference ExpireReservesMaxPickUpDelayCharge, add reseves.charge_if_expired)\n"; misc/cronjobs/holds/cancel_expired_holds.pl:37:This script calls C4::Reserves::CancelExpiredReserves which will find and cancel all expired reseves in the system. magnus@bilbo ~/code/kohaclone (master)$ grep -rn "reseve" * installer/data/mysql/kohastructure.sql:2233: `location` varchar(80) DEFAULT NULL COMMENT 'new shelving location for the item to have while on reseve (optional)', installer/data/mysql/kohastructure.sql:2236: `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''', installer/data/mysql/updatedatabase.pl:4907: print "Upgrade to $DBversion done (Added system preference ExpireReservesMaxPickUpDelay, system preference ExpireReservesMaxPickUpDelayCharge, add reseves.charge_if_expired)\n"; Koha/Schema/Result/CourseItem.pm:155:new shelving location for the item to have while on reseve (optional) Koha/Schema/Result/CourseItem.pm:180:if at least one enabled course has this item on reseve, this field will be 'yes', otherwise it will be 'no' misc/cronjobs/holds/cancel_expired_holds.pl:37:This script calls C4::Reserves::CancelExpiredReserves which will find and cancel all expired reseves in the system.