[Bps-public-commit] RT-Extension-MergeUsers branch master updated. 1.08-5-g79485f9

[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, master has been updated
       via  79485f911f74cf11b89d816933054a5ab661ccf2 (commit)
       via  99e922812ea00013cd18f20bd85e048e03776cc5 (commit)
       via  2d4d29368fc9f95db3a2ff42587f4713644e7c72 (commit)
      from  2169ab73f44ab8e575b553141e053bda99b61062 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 79485f911f74cf11b89d816933054a5ab661ccf2
Author: Jason Crome <jcrome at bestpractical.com>
Date:   Wed Mar 20 15:53:29 2024 -0400

    Prep 1.09

diff --git a/Changes b/Changes
index 3ad0787..676209d 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,10 @@
 Revision history for RT-Extension-MergeUsers
 
+1.09 2024-03-20
+ - Do not try to load user from an empty email address
+ - Fix uninitialized warnings cased by undefined FIELD
+ - Only limit roles by id for valid users
+
 1.08 2023-05-16
  - Cover merged user ids for ticket owner searches
  - Cover merged user ids for ACL check in searches
diff --git a/META.yml b/META.yml
index fdcef37..761b7fa 100644
--- a/META.yml
+++ b/META.yml
@@ -28,6 +28,6 @@ requires:
 resources:
   license: http://opensource.org/licenses/gpl-license.php
   repository: https://github.com/bestpractical/rt-extension-mergeusers
-version: '1.08'
+version: '1.09'
 x_module_install_rtx_version: '0.43'
 x_requires_rt: 4.0.0
diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index 19cbb65..13e11a4 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -55,7 +55,7 @@ use RT::Shredder;
 
 package RT::Extension::MergeUsers;
 
-our $VERSION = '1.08';
+our $VERSION = '1.09';
 
 =head1 NAME
 

commit 99e922812ea00013cd18f20bd85e048e03776cc5
Merge: 2169ab7 2d4d293
Author: Jason Crome <jcrome at bestpractical.com>
Date:   Wed Mar 20 15:49:09 2024 -0400

    Merge branch 'limit-roles-by-id-valid-users-only'


commit 2d4d29368fc9f95db3a2ff42587f4713644e7c72
Author: Jason Crome <jcrome at bestpractical.com>
Date:   Wed Mar 20 15:48:26 2024 -0400

    Only limit roles by id for valid users
    
    Otherwise we may search id(int) with a string that some dbs do not
    support.

diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index f207078..19cbb65 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -666,8 +666,8 @@ sub TweakRoleLimitArgs {
             : $args{FIELD} eq 'EmailAddress' ? 'LoadByEmail'
             :                                  'Load';
         $o->$method( $args{VALUE} );
-        $args{FIELD} = 'id';
         if ( $o->id ) {
+            $args{FIELD} = 'id';
             if ( my $merged_users = $o->FirstAttribute('MergedUsers') ) {
                 $args{VALUE} = [ $o->id, @{ $merged_users->Content } ];
                 $args{OPERATOR} = $is_negative ? 'NOT IN' : 'IN';

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

Summary of changes:
 Changes                        | 5 +++++
 META.yml                       | 2 +-
 lib/RT/Extension/MergeUsers.pm | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)


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