From 8f9a4d68b14b3172e2566e3e1ed1760f059c31d0 Mon Sep 17 00:00:00 2001 From: Laura Escamilla Date: Thu, 19 Oct 2023 18:25:51 +0000 Subject: [PATCH] Bug 34954: Fixed typo to 'dateexpiry' To test: 1. In KTD use grep -rn --exclude=*.po "datexpiry" * 2. Notice that the four locations below are showing the typo: 1. git add koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt 2. git add misc/release_notes/release_notes_18_05_00.html 3. git add misc/release_notes/release_notes_18_05_00.md 4. git add t/db_dependent/Koha/Patrons/Import.t 3. Apply patch. Repeat step 1. 4. Notice that no results show. All instances of the typo have been fixed to dateexpiry. 5. Sign off and have a great day :) Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d742f29d77ee1e8a6f825678ce879d4a04037c92) Signed-off-by: Fridolin Somers (cherry picked from commit 9b87ae61ad81e056ff7f8972ee8deca86666e17b) Signed-off-by: Matt Blenkinsop --- .../intranet-tmpl/prog/en/modules/tools/import_borrowers.tt | 2 +- misc/release_notes/release_notes_18_05_00.html | 2 +- misc/release_notes/release_notes_18_05_00.md | 2 +- t/db_dependent/Koha/Patrons/Import.t | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt index 4366ae4655..3743bf816b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt @@ -314,7 +314,7 @@
  • diff --git a/misc/release_notes/release_notes_18_05_00.html b/misc/release_notes/release_notes_18_05_00.html index 9b1db701e1..4fcf402095 100644 --- a/misc/release_notes/release_notes_18_05_00.html +++ b/misc/release_notes/release_notes_18_05_00.html @@ -789,7 +789,7 @@ have already been fixed in maintainance releases)

  • [19847] tracklinks.pl accepts any url from a parameter for proxying
  • [19881] authorities-list.pl can be executed by anybody
  • [20126] Saving a biblio does no longer update MARC field lengths
    • -
  • [20145] borrowers.datexpiry eq '0000-00-00' means expired?
    • +
  • [20145] borrowers.dateexpiry eq '0000-00-00' means expired?
  • [20229] Remove problematic SQL modes
  • [20299] Koha is a gift
  • [20323] Batch patron modification tool broken
    • diff --git a/misc/release_notes/release_notes_18_05_00.md b/misc/release_notes/release_notes_18_05_00.md index 44894be023..32d962863a 100644 --- a/misc/release_notes/release_notes_18_05_00.md +++ b/misc/release_notes/release_notes_18_05_00.md @@ -626,7 +626,7 @@ have already been fixed in maintainance releases) - [[19847]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19847) tracklinks.pl accepts any url from a parameter for proxying - [[19881]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19881) authorities-list.pl can be executed by anybody - [[20126]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20126) Saving a biblio does no longer update MARC field lengths -- [[20145]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20145) borrowers.datexpiry eq '0000-00-00' means expired? +- [[20145]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20145) borrowers.dateexpiry eq '0000-00-00' means expired? - [[20229]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20229) Remove problematic SQL modes - [[20299]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20299) Koha is a gift - [[20323]](http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20323) Batch patron modification tool broken diff --git a/t/db_dependent/Koha/Patrons/Import.t b/t/db_dependent/Koha/Patrons/Import.t index 9a33f8efcf..dd19bbe16a 100755 --- a/t/db_dependent/Koha/Patrons/Import.t +++ b/t/db_dependent/Koha/Patrons/Import.t @@ -1201,7 +1201,7 @@ subtest 'test update_dateexpiry when no dateexpiry in file' => sub { is( $patron->dateexpiry, dt_from_string->add( months => 18, end_of_month => 'limit' )->ymd, - "Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_datexpiryfromtoday false (i.e. use passed dateenrolled) " + "Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_dateexpiryfromtoday false (i.e. use passed dateenrolled) " ); $filename_1 = make_csv( $temp_dir, $csv_headers, $csv_values ); @@ -1214,7 +1214,7 @@ subtest 'test update_dateexpiry when no dateexpiry in file' => sub { $patron->discard_changes(); is( $patron->dateexpiry, dt_from_string->add( months => 42, end_of_month => 'limit' )->ymd, - "Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_datexpiryfromtoday true " + "Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_dateexpiryfromtoday true " ); $csv_headers = 'cardnumber,surname,branchcode,categorycode'; @@ -1228,7 +1228,7 @@ subtest 'test update_dateexpiry when no dateexpiry in file' => sub { $patron->discard_changes(); is( $patron->dateexpiry, dt_from_string->add( months => 42, end_of_month => 'limit' )->ymd, - "Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_datexpiryfromtoday false but no dateenrolled in file (today is used) " + "Expiration date is correct with update_dateexpiry = true no dateexpiry in file and update_dateexpiryfromtoday false but no dateenrolled in file (today is used) " ); }; -- 2.39.5