Bugzilla – Attachment 189037 Details for
Bug 34069
Add ability to restore a recently deleted borrower from deletedborrowers
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34069: Add ability to search on updated_on dates
Bug-34069-Add-ability-to-search-on-updatedon-dates.patch (text/plain), 4.82 KB, created by
Lucas Gass (lukeg)
on 2025-11-04 16:07:40 UTC
(
hide
)
Description:
Bug 34069: Add ability to search on updated_on dates
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2025-11-04 16:07:40 UTC
Size:
4.82 KB
patch
obsolete
>From a330f3bb32d70e283fe1b204e106f3cb13987ab2 Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Tue, 4 Nov 2025 16:07:05 +0000 >Subject: [PATCH] Bug 34069: Add ability to search on updated_on dates > >--- > .../tools/restore_deleted_borrowers.tt | 9 +++++++ > .../prog/en/modules/tools/tools-home.tt | 2 +- > tools/restore_deleted_borrowers.pl | 24 ++++++++++++++++++- > 3 files changed, 33 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/restore_deleted_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/restore_deleted_borrowers.tt >index f3b70e98af1..d5770e0845e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/restore_deleted_borrowers.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/restore_deleted_borrowers.tt >@@ -81,6 +81,14 @@ > [% PROCESS options_for_libraries libraries => Branches.all() %] > </select> > </li> >+ <li> >+ <label for="deleted_from">Deleted after:</label> >+ <input type="text" size="10" id="deleted_from" name="deleted_from" value="[% deleted_from | html %]" class="flatpickr" /> >+ </li> >+ <li> >+ <label for="deleted_to">Deleted before:</label> >+ <input type="text" size="10" id="deleted_to" name="deleted_to" value="[% deleted_to | html %]" class="flatpickr" /> >+ </li> > </ol> > </fieldset> > <fieldset class="action"> >@@ -209,6 +217,7 @@ > <!-- /.main.container-fluid --> > > [% MACRO jsinclude BLOCK %] >+ [% INCLUDE 'calendar.inc' %] > [% Asset.js("js/tools-menu.js") | $raw %] > [% INCLUDE 'datatables.inc' %] > <script> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >index 8219370ca09..efc38fca155 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt >@@ -43,7 +43,7 @@ > <dd>Manage patron clubs</dd> > [% END %] > >- [% IF (CAN_user_borrowers_restore_deleted_borrowers) %] >+ [% IF (CAN_user_borrowers_restore_deleted_borrowers && Koha.Preference('AllowDeletedPatronRestoration')) %] > <dt><a href="/cgi-bin/koha/tools/restore_deleted_borrowers.pl">Restore deleted patrons</a></dt> > <dd>Restore deleted patrons from the deletedborrowers table</dd> > [% END %] >diff --git a/tools/restore_deleted_borrowers.pl b/tools/restore_deleted_borrowers.pl >index 1a8e1b675f6..02f93e3ef6a 100755 >--- a/tools/restore_deleted_borrowers.pl >+++ b/tools/restore_deleted_borrowers.pl >@@ -53,9 +53,20 @@ if ( $op eq 'search' ) { > my $email = $input->param('email'); > my $categorycode = $input->param('categorycode'); > my $branchcode = $input->param('branchcode'); >+ my $deleted_from = $input->param('deleted_from'); >+ my $deleted_to = $input->param('deleted_to'); > > # No empty searches, if no search critrea is added, do nothing. >- if ( $cardnumber || $borrowernumber || $surname || $firstname || $email || $categorycode || $branchcode ) { >+ if ( $cardnumber >+ || $borrowernumber >+ || $surname >+ || $firstname >+ || $email >+ || $categorycode >+ || $branchcode >+ || $deleted_from >+ || $deleted_to ) >+ { > > # empty search parameters > my %search_params; >@@ -71,6 +82,15 @@ if ( $op eq 'search' ) { > $search_params{firstname} = { 'like' => "%$firstname%" } if $firstname; > $search_params{email} = { 'like' => "%$email%" } if $email; > >+ #date parameters >+ if ( $deleted_from && $deleted_to ) { >+ $search_params{updated_on} = { -between => [ $deleted_from, $deleted_to ] }; >+ } elsif ($deleted_from) { >+ $search_params{updated_on} = { '>=' => $deleted_from }; >+ } elsif ($deleted_to) { >+ $search_params{updated_on} = { '<=' => $deleted_to }; >+ } >+ > my $deleted_patrons_rs = Koha::Old::Patrons->search( > \%search_params, > { >@@ -105,6 +125,8 @@ if ( $op eq 'search' ) { > surname => $surname, > firstname => $firstname, > email => $email, >+ deleted_from => $deleted_from, >+ deleted_to => $deleted_to, > ); > } else { > $template->param( view => 'search' ); >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 34069
:
188299
|
188302
|
188988
|
188989
|
188990
|
189027
|
189028
|
189029
|
189030
|
189037
|
189066
|
189067
|
189370
|
189371
|
189372
|
189373
|
189374
|
189375
|
189376
|
189377
|
189642
|
189645
|
189718
|
189773
|
189774
|
189779
|
189780
|
189781
|
189782
|
189783
|
189784
|
189785
|
189786
|
189787
|
189788
|
189789
|
189790
|
189791
|
189792
|
189793
|
189794
|
189795
|
189940
|
189941
|
189942
|
189943
|
189944
|
189945
|
189946
|
189947
|
189948
|
189949
|
189950
|
189951
|
189952
|
189953
|
189954