[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.1-50-gf533f90

[Alex Vandiver]

The branch, 4.2-trunk has been updated
       via  f533f9047b5bc83bc804d54cf82b7be30be50662 (commit)
       via  16cafe400c04d76c579d07cda0b2b2fb4fadd342 (commit)
      from  25895f4c1f4fb8741a414d8ce439f242143fb5c8 (commit)

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

- Log -----------------------------------------------------------------
commit 16cafe400c04d76c579d07cda0b2b2fb4fadd342
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.pm b/lib/RT/Group.pm
index ccd6566..163206a 100644
--- a/lib/RT/Group.pm
+++ b/lib/RT/Group.pm
@@ -1693,6 +1693,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.pm b/lib/RT/User.pm
index 143113f..5bb1d41 100644
--- a/lib/RT/User.pm
+++ b/lib/RT/User.pm
@@ -2751,6 +2751,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 f533f9047b5bc83bc804d54cf82b7be30be50662
Merge: 25895f4 16cafe4
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Dec 5 16:14:32 2013 -0500

    Merge branch '4.2/serializer-set-user-group-id-from-principal' into 4.2-trunk


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