Skip to content

Commit 0a69109

Browse files
committed
Merge branch '6.0/serializer-authtokens' into 6.0-trunk
2 parents 7afee33 + d84f6cc commit 0a69109

File tree

4 files changed

+11
-1
lines changed

4 files changed

+11
-1
lines changed

lib/RT.pm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -624,6 +624,8 @@ sub InitClasses {
624624
require RT::DashboardSubscriptions;
625625
require RT::ObjectContent;
626626
require RT::ObjectContents;
627+
require RT::AuthToken;
628+
require RT::AuthTokens;
627629

628630
_BuildTableAttributes();
629631

@@ -691,6 +693,7 @@ sub _BuildTableAttributes {
691693
RT::DashboardSubscription
692694
RT::ObjectContent
693695
RT::Configuration
696+
RT::AuthToken
694697
);
695698
}
696699

lib/RT/Migrate/Serializer.pm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,9 @@ sub PushAll {
237237
# Shorteners
238238
$self->PushCollections(qw(Shorteners));
239239

240+
# AuthTokens
241+
$self->PushCollections(qw(AuthTokens));
242+
240243
$self->PushCollections(qw(Links));
241244
$self->PushCollections(qw(Transactions Attachments));
242245

lib/RT/User.pm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3118,6 +3118,10 @@ sub FindDependencies {
31183118
);
31193119
$deps->Add( in => $objs );
31203120

3121+
$objs = RT::AuthTokens->new( $self->CurrentUser );
3122+
$objs->LimitOwner( VALUE => $self->Id );
3123+
$deps->Add( in => $objs );
3124+
31213125
# XXX: This ignores the myriad of "in" references from the Creator
31223126
# and LastUpdatedBy columns.
31233127
}

sbin/rt-serializer.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ sub estimate {
254254
# Expected types we'll serialize
255255
my @types = map {"RT::$_"} qw/
256256
Queue Ticket Transaction Attachment Link
257-
User Group GroupMember Attribute
257+
User Group GroupMember Attribute AuthToken
258258
CustomField CustomFieldValue
259259
ObjectCustomField ObjectCustomFieldValue
260260
Catalog Asset SavedSearch Dashboard DashboardSubscription ObjectContent

0 commit comments

Comments
 (0)