Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 34954: Fixed typo to 'dateexpiry'

Browse source 
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 <david@davidnind.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit d742f29d77)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Laura Escamilla 2023-10-19 18:25:51 +00:00 committed by Fridolin Somers
parent dfd5562503
commit 9b87ae61ad
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
View file

@ -314,7 +314,7 @@
<li>
<label class="update_dateexpiry" for="update_dateexpiry">Renew existing patrons</label>
<select class="update_dateexpiry" type="select" id="update_dateexpiry" name="update_dateexpiry" disabled/>
<option value="">using the datexpiry value in the file, if present</option>
<option value="">using the dateexpiry value in the file, if present</option>
<option value="dateexpiry">from the current membership expiry date</option>
<option value="now">from the current date</option>
</select>

2
misc/release_notes/release_notes_18_05_00.html
View file

@ -789,7 +789,7 @@ have already been fixed in maintainance releases)</p>
<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19847">[19847]</a> tracklinks.pl accepts any url from a parameter for proxying</li>
<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=19881">[19881]</a> authorities-list.pl can be executed by anybody</li>
<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20126">[20126]</a> Saving a biblio does no longer update MARC field lengths</li>
<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20145">[20145]</a> borrowers.datexpiry eq '0000-00-00' means expired?</li>
<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20145">[20145]</a> borrowers.dateexpiry eq '0000-00-00' means expired?</li>
<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20229">[20229]</a> Remove problematic SQL modes</li>
<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20299">[20299]</a> Koha is a gift</li>
<li><a href="http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20323">[20323]</a> Batch patron modification tool broken</li>

2
misc/release_notes/release_notes_18_05_00.md
View file

@ -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

6
t/db_dependent/Koha/Patrons/Import.t
View file

@ -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) "
);
};