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

[Maureen Mirville]

The branch 4.4/download-user-info was deleted and repushed:
       was 8a515f13cd21536681879117422134fbf998da76
       now 06bb852074d091b7066269e9fca7b203d9869308

1: 7e03a7e76 = 1: 7e03a7e76 Add column to transaction column map for content
2: 272ff90f6 ! 2: d2908a723 Add config options for download user data result formats
    @@ -24,7 +24,20 @@
     +
     +=cut
     +
    -+Set($UserTicketDataResultFormat, $DefaultSearchResultFormat);
    ++Set($UserTicketDataResultFormat, qq{
    ++   '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></B>/TITLE:#',
    ++   '<B><A HREF="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></B>/TITLE:Subject',
    ++   Status,
    ++   QueueName,
    ++   Owner,
    ++   Priority,
    ++   '__NEWLINE__',
    ++   '__NBSP__',
    ++   '<small>__Requestors__</small>',
    ++   '<small>__CreatedRelative__</small>',
    ++   '<small>__ToldRelative__</small>',
    ++   '<small>__LastUpdatedRelative__</small>',
    ++   '<small>__TimeLeft__</small>'});
     +
     +=item C<$UserDataResultFormat>
     +
3: e635cae75 = 3: 70d08fc22 Create helper for exporting user related information
4: 0d5f5c2e9 ! 4: e8f527766 Create portlet for downloading user information
    @@ -65,17 +65,23 @@
     +&>
     +
     +<div>
    -+    <a href="/Helpers/UserRelatedData.tsv?Type=User&id=<% $UserObj->id %>" class="button"><&|/l&>Download User Data</&></a>
    -+    <a href="/Search/Results.tsv?Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>" class="button"><&|/l&>Download User Tickets</&></a>
    -+    <a href="/Helpers/UserRelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>" class="button"><&|/l&>Download User Transaction Data</&></a>
    ++    <a href="/Helpers/UserRelatedData.tsv?Type=User&id=<% $UserObj->id %>" class="button"><% loc($UserDataButton) %></a>
    ++    <a href="/Search/Results.tsv?Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>" class="button"><% loc($UserTicketsButton) %></a>
    ++% if ( $SeeUserTxn ) {
    ++    <a href="/Helpers/UserRelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>" class="button"><% loc($UserTxnButton) %></a>
    ++% }
     +</div>
     +</&>
     +
     +<%INIT>
    -+my $Format = RT->Config->Get('UserTicketDataResultFormat');
    ++my $Format = RT->Config->Get('UserTicketDataResultFormat') || RT->Config->Get('DefaultSearchResultFormat');
     +</%INIT>
     +
     +<%ARGS>
     +$UserObj
    ++$UserDataButton => 'Download User Data'
    ++$UserTicketsButton => 'Download User Tickets'
    ++$UserTxnButton => 'Download User Transaction Data'
    ++$SeeUserTxn => $session{'CurrentUser'}->HasRight( Right => 'AdminUsers', Object => $RT::System )
     +</%ARGS>
     
5: 37a04fee5 = 5: d13bb7254 Add user data download portlet to admin user modify page
6: be13f3385 ! 6: 54f2745f5 Add download user data portlet to AboutMe.html page
    @@ -9,7 +9,12 @@
      
      </form>
      
    -+<& /Elements/UserRelatedData, UserObj => $UserObj &>
    ++<& /Elements/UserRelatedData, UserObj => $UserObj,
    ++    UserDataButton => 'Download My Data',
    ++    UserTicketsButton => 'Download My Tickets',
    ++    UserTxnButton => 'Download My Transaction Data',
    ++    SeeUserTxn => 1,
    ++&>
      
      <%INIT>
      
7: 8a515f13c = 7: 06bb85207 Create test for user information TSV download