[Bps-public-commit] rtx-migrate branch, master, updated. 0.14-4-g9b6a53a

[Alex Vandiver]

The branch, master has been updated
       via  9b6a53a773fb4806cc61b8d069e5a54c121ba454 (commit)
       via  780c51c929c360dadf515bd92f2ed182a9ef4216 (commit)
      from  b7368a3b4b0c0daf64eae1e33553d18ed97fb7ad (commit)

Summary of changes:
 lib/RT/Group_Vendor.pm | 4 ++++
 lib/RT/User_Vendor.pm  | 4 ++++
 2 files changed, 8 insertions(+)

- Log -----------------------------------------------------------------
commit 780c51c929c360dadf515bd92f2ed182a9ef4216
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Thu Jan 17 11:25:44 2013 -0500

    Store created principal id for use by User and Group
    
    Principal ids should be the same as their associated user or
    group id, so save the id of newly created principals in the
    RT::User and RT::Group PreInflate calls to be used when the
    user or group record is created.

diff --git a/lib/RT/Group_Vendor.pm b/lib/RT/Group_Vendor.pm
index 95ed9ce..363b550 100644
--- a/lib/RT/Group_Vendor.pm
+++ b/lib/RT/Group_Vendor.pm
@@ -110,6 +110,10 @@ sub PreInflate {
         Disabled => $disabled,
         ObjectId => 0,
     );
+
+    # Now we have a principal id, set the id for the group record
+    $data->{id} = $id;
+
     $importer->Resolve( $principal_uid => ref($principal), $id );
 
     $importer->Postpone(
diff --git a/lib/RT/User_Vendor.pm b/lib/RT/User_Vendor.pm
index a514c6c..70b1921 100644
--- a/lib/RT/User_Vendor.pm
+++ b/lib/RT/User_Vendor.pm
@@ -95,6 +95,10 @@ sub PreInflate {
         Disabled => $disabled,
         ObjectId => 0,
     );
+
+    # Now we have a principal id, set the id for the user record
+    $data->{id} = $id;
+
     $importer->Resolve( $principal_uid => ref($principal), $id );
 
     $importer->Postpone(

commit 9b6a53a773fb4806cc61b8d069e5a54c121ba454
Merge: b7368a3 780c51c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Dec 5 16:14:55 2013 -0500

    Merge branch 'set-user-group-id-from-principal'


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