[Bps-public-commit] RT-Extension-MergeUsers branch, master, updated. 0.12_01-3-gd50bb6e

Alex Vandiver alexmv at bestpractical.com
Thu Feb 6 16:12:07 EST 2014 

The branch, master has been updated
       via  d50bb6efcf69cd2ec83cdd45ef3b64c996c70802 (commit)
       via  3788fe41b35bd3349adda7dac9133854ac2fb377 (commit)
       via  d648e29575a22939ac469cee8869b4381cc47900 (commit)
      from  6c5be82269acefff0578a4ef502410e9ee786497 (commit)

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

- Log -----------------------------------------------------------------
commit d648e29575a22939ac469cee8869b4381cc47900
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Feb 6 16:05:07 2014 -0500

    ->CanonicalizeEmailAddress may be a class method; don't assume $self
    
    03573403 switched several uses of $RT::SystemUser to $self->CurrentUser,
    on the basis that the current user should be propagated throughout,
    rather than fixed to the current user.  However, the change in
    CanonicalizeEmailAddress was overzealous, as that can be called as a
    class method.
    
    As the $canonical_user in this context is lexical, is not altered, and
    should not be ACL'd in any way, hardcoding the system user is correct;
    restore it.

diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index 05b9e78..4d193f1 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -124,7 +124,7 @@ sub CanonicalizeEmailAddress {
     }
 
     # get the user whose email address this is
-    my $canonical_user = RT::User->new( $self->CurrentUser );
+    my $canonical_user = RT::User->new( $RT::SystemUser );
     $canonical_user->LoadByCols( EmailAddress => $address );
     return $address unless $canonical_user->id;
     return $address unless $canonical_user->EmailAddress ne $address;

commit 3788fe41b35bd3349adda7dac9133854ac2fb377
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Feb 6 16:10:42 2014 -0500

    Reformat Changes

diff --git a/Changes b/Changes
index 40c332a..51eceaf 100644
--- a/Changes
+++ b/Changes
@@ -1,13 +1,13 @@
 0.11 Tue Sep 10 14:42:46 MSK 2013
 
-    * For every merged user in a collection one user at the end of
-      the collection was skipped, for example in owners drop down,
-      admin interface or in autocompletion lists.
+   * For every merged user in a collection one user at the end of
+     the collection was skipped, for example in owners drop down,
+     admin interface or in autocompletion lists.
 
 0.10 Fri Aug  2 15:34:06 PDT 2013
 
-    * Enable user autocomplete on the "Merge user into" form for RT 4.2
-    * Correct a packaging error in MANIFEST in the previous release
+   * Enable user autocomplete on the "Merge user into" form for RT 4.2
+   * Correct a packaging error in MANIFEST in the previous release
 
 0.09 Wed Jun 26 15:06:42 EST 2013
 
@@ -20,49 +20,52 @@
 
 0.08 Mon Feb 25 13:33:48 PST 2013
 
-    * Move tests to author-only; they require having an RT installed somewhere
-    * Switch to .in files for substitution so as not to trash version-controlled files
+    * Move tests to author-only; they require having an RT installed
+      somewhere
+    * Switch to .in files for substitution so as not to trash
+      version-controlled files
     * Record the merged/mergee's user Name if EmailAddress is empty
     * Unset EmailAddress by setting the empty string rather than undef
     * Switch to modern RT::Test infrastructure for testing plugins
 
 0.07 Thu Aug 30 12:09:31 EST 2012
 
-    Fix bug of "user email address destroys matching address in other ouser"(#70641)
+    * Fix bug of "user email address destroys matching address in other
+      user" (#70641)
 
 0.06
-    Actually clear the seen_users cache when we get undef back from SUPER::Next
+
+    * Actually clear the seen_users cache when we get undef back from SUPER::Next
 
 0.05
-    Update packaging and install infrastructure for RT 4
+
+    * Update packaging and install infrastructure for RT 4
 
 0.04
-    Also clear cache when merging
-    Update docs
+    * Also clear cache when merging
+    * Update docs
 
 0.04_01
 
-    Fix bug in cache and unmerging
-    Apply modified patch from Jason A Smith to make it clearer
-     which users are being affected.
+    * Fix bug in cache and unmerging
+    * Apply modified patch from Jason A Smith to make it clearer which
+      users are being affected.
 
 0.03
 
-    Release updates from 0.03 prereleases 
+    * Release updates from 0.03 prereleases
 
 0.03_02 2009-04-06 Tue 17:08 -0400 falcone
 
-    Track merged users bidirectionally
-    Allow unmerging users from the main user's modification page
-    Show errors/results from merging
-    Add new script for adding bidirectional attributes to old installs
+    * Track merged users bidirectionally
+    * Allow unmerging users from the main user's modification page
+    * Show errors/results from merging
+    * Add new script for adding bidirectional attributes to old installs
 
 0.03_01 2008-11-23 Sun 18:51 -0500 falcone
 
-   remove User_Overlay and Users_Overlay to avoid
-   conflicts with other plugins 
-
-   Use callbacks available in 3.6/3.8 rather than
-   overriding the whole Admin/Users/Modify.html template
-
-   Upgrade Module::Install::RTx to work with 3.8
+    * remove User_Overlay and Users_Overlay to avoid conflicts with
+      other plugins
+    * Use callbacks available in 3.6/3.8 rather than overriding the
+      whole Admin/Users/Modify.html template
+    * Upgrade Module::Install::RTx to work with 3.8

commit d50bb6efcf69cd2ec83cdd45ef3b64c996c70802
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Feb 6 16:11:38 2014 -0500

    Bump version to 12_03

diff --git a/Changes b/Changes
index 51eceaf..ce26228 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+0.12
+
+   * Merge users as the current user, not always the superuser
+
 0.11 Tue Sep 10 14:42:46 MSK 2013
 
    * For every merged user in a collection one user at the end of
diff --git a/META.yml b/META.yml
index 424b0c2..21c9770 100644
--- a/META.yml
+++ b/META.yml
@@ -23,4 +23,4 @@ requires:
   perl: 5.8.3
 resources:
   license: http://opensource.org/licenses/gpl-license.php
-version: 0.12_01
+version: 0.12_02
diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index 4d193f1..3d9817a 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -49,7 +49,7 @@ use warnings; no warnings qw(redefine);
 
 package RT::Extension::MergeUsers;
 
-our $VERSION = '0.12_01';
+our $VERSION = '0.12_02';
 
 =head1 NAME
 

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

More information about the Bps-public-commit mailing list