[Rt-commit] rt branch, 4.2/importer-merge-same-organization, created. rt-4.2.3-60-ge49736b

[Alex Vandiver]

The branch, 4.2/importer-merge-same-organization has been created
        at  e49736bd3addd2f0316cb9b4f22bf86e47cdc517 (commit)

- Log -----------------------------------------------------------------
commit e49736bd3addd2f0316cb9b4f22bf86e47cdc517
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Mar 27 12:15:07 2014 -0400

    When merging instances with identical $Organization, do not qualify names
    
    Qualify() is meant to ensure that objects which are name-unique keep
    their own "namespace" when merged across different RT instances.
    Importing an RT into one with an identical $Organization is a fair sign
    that they are from the same provenance, and thus should merge Groups and
    Queues, instead of creating duplicates.

diff --git a/lib/RT/Migrate/Importer.pm b/lib/RT/Migrate/Importer.pm
index 14fb23a..3607bba 100644
--- a/lib/RT/Migrate/Importer.pm
+++ b/lib/RT/Migrate/Importer.pm
@@ -291,6 +291,7 @@ sub Qualify {
     my ($string) = @_;
     return $string if $self->{Clone};
     return $string if not defined $self->{Organization};
+    return $string if $self->{Organization} eq $RT::Organization;
     return $self->{Organization}.": $string";
 }
 

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