[Rt-commit] rt branch, 4.4/download-user-info, repushed

[Craig Kaiser]

The branch 4.4/download-user-info was deleted and repushed:
       was 5624f57a5ed7796b7defd8fe80f6a7089fc74dfe
       now 1035e04c84f8541c2f2c11a2ba0d84ea19df5fb1

 1: 0837d00cc =  1: 0837d00cc Add option to disable escaping HTML in articles
 2: d933dbc30 =  2: d933dbc30 Updated Articles docs to include disabling escaped HTML
 3: 444232a01 =  3: 444232a01 Update article postfix loops from using $_ to a named variable
 4: d3f769cb2 =  4: d3f769cb2 Add keyboard shortcuts for reply and comment
 5: e5e0327b5 =  5: e5e0327b5 Allow rt-setup-fulltext-index to prompt for dba password
 6: 72f02a602 =  6: 72f02a602 Fix typo in POD
 7: 17a8d61a2 =  7: 17a8d61a2 Add column to transaction column map for content
 8: 0dd1999a1 !  8: 64dacf4dc Create portlet for downloading user information
    @@ -64,7 +64,7 @@
     +    title => loc("User related info"),
     +&>
     +% # Only show these options when current user is viewing themselves
    -+% if ( $UserObj->id == $session{CurrentUser}->id ) {
    ++% if ( defined $UserObj->id && defined $user->id && $UserObj->id == $user->id ) {
     +<div>
     +    <div>
     +        <a href="/Helpers/MyRelatedInfo.tsv?Type=User&UserId=<% $UserObj->id %>" class="button">Download My User Info</a>
    @@ -77,9 +77,13 @@
     +
     +<%INIT>
     +my $Format = RT->Config->Get('UserDataSearchResultFormat') || RT->Config->Get('DefaultSearchResultFormat');
    ++
    ++my $user = RT::User->new($session{CurrentUser});
    ++my ($ret, $msg) = $user->Load($session{CurrentUser});
    ++RT::Logger->error($msg) unless $ret;
     +</%INIT>
     +
     +<%ARGS>
    -+$UserObj        => undef
    ++$UserObj
     +</%ARGS>
     
 9: 9be9247cd !  9: aa3803df1 Create helper for exporting user related information
    @@ -71,13 +71,13 @@
     +my ($ret, $msg) = $user->Load($session{'CurrentUser'});
     +RT::Logger->error($msg) unless $ret;
     +
    -+if ( $Type eq 'User' ) {
    ++if ( defined $Type && $Type eq 'User' ) {
     +    $Format = "'__id__', '__Name__', '__EmailAddress__', '__RealName__', '__NickName__', '__Organization__', '__HomePhone__', '__WorkPhone__','__MobilePhone__', '__PagerPhone__', '__Address1__', '__Address2__', '__City__', '__State__','__Zip__', '__Country__', '__Gecos__', '__Lang__', '__FreeFormContactInfo__'";
     +
     +    $Collection = RT::Users->new($session{'CurrentUser'});
     +    $Collection->Limit( FIELD => 'id', VALUE => $user->id );
     +
    -+} elsif ( $Type eq 'Transaction' ) {
    ++} elsif ( defined $Type &&   $Type eq 'Transaction' ) {
     +    $Format = "'__ObjectId__', '__id__', '__Created__', '__Description__', '__OldValue__', '__NewValue__', '__Content__'";
     +
     +    $Collection = RT::Transactions->new($session{'CurrentUser'});
    @@ -88,6 +88,6 @@
     +    $Collection->Limit( FIELD => 'Type',       VALUE => 'Comment' );
     +}
     +
    -+$m->comp( "/Elements/TSVExport", Collection => $Collection, Format => $Format, PreserveNewLines => $PreserveNewLines );
    ++$m->comp( "/Elements/TSVExport", Collection => $Collection, Format => $Format, PreserveNewLines => $PreserveNewLines ) unless !defined $Type;
     +</%INIT>
     
10: e0460fd70 = 10: 20bdce30d Add user download portlet to Admin modify page
11: 6c90c1c89 = 11: 271340037 Create test for user PII TSV download
12: 5624f57a5 = 12: 1035e04c8 Add 'UserDataSearchResultFormat' config option