[Bps-public-commit] RT-Extension-MergeUsers branch fix-user-search-pagination created. 1.06-2-g7094b7c

[BPS Git Server]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "RT-Extension-MergeUsers".

The branch, fix-user-search-pagination has been created
        at  7094b7c924ac1dcb3cee5907c3e905ca490b9597 (commit)

- Log -----------------------------------------------------------------
commit 7094b7c924ac1dcb3cee5907c3e905ca490b9597
Author: Ronaldo Richieri <ronaldo at bestpractical.com>
Date:   Thu Apr 13 10:28:21 2023 -0300

    Fixed User Search Pagination
    
    Since DBIx::SearchBuilder 1.72, search is performed in a __DoSearch
    (2 underlines) and not more on _DoSearch (1 underline). This patch
    makes sure users_seen is reset before the search is performed in the new
    __DoSearch method.
    
    Also makes sure extension is being installed with version 1.72 or
    higher of DBIx::SearchBuilder for compatibility with the new
    method.

diff --git a/Makefile.PL b/Makefile.PL
index c159943..1048fb9 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -8,6 +8,8 @@ repository('https://github.com/bestpractical/rt-extension-mergeusers');
 my ($lib_path) = $INC{'RT.pm'} =~ /^(.*)[\\\/]/;
 my $local_lib_path = "$RT::LocalPath/lib";
 
+requires('DBIx::SearchBuilder' => '1.72');
+
 # Straight from perldoc perlvar
 use Config;
 my $secure_perl_path = $Config{perlpath};
diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index 848214d..fae4894 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -429,10 +429,10 @@ sub AddRecord {
     return $self->SUPER::AddRecord($record);
 }
 
-sub _DoSearch {
+sub __DoSearch {
     my $self = shift;
     delete $self->{seen_users};
-    return $self->SUPER::_DoSearch(@_);
+    return $self->SUPER::__DoSearch(@_);
 }
 
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
RT-Extension-MergeUsers