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

[Craig Kaiser]

The branch 4.4/download-user-info was deleted and repushed:
       was 5f5965c3feab166f051c04bdf2a39ac96a18cc47
       now 1e830b0f1283047c85b88e80c7eeaeac249ee589

1: 0aad7cfc6 = 1: 0aad7cfc6 Add column to transaction column map for content
2: 98e985990 = 2: 98e985990 Add config options for download user data result formats
3: 233bf58a0 = 3: 233bf58a0 Create helper for exporting user related information
4: ac2bfaec7 = 4: ac2bfaec7 Create portlet for downloading user information
5: e97921391 = 5: e97921391 Add user data download portlet to admin user modify page
6: 110ee095a = 6: 110ee095a Add download user data portlet to AboutMe.html page
7: 2065a16e0 ! 7: 0e35a9759 Add user download component to self service
    @@ -1,6 +1,20 @@
     Author: Craig Kaiser <craig at bestpractical.com>
     
         Add user download component to self service
    +
    +diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
    +--- a/etc/RT_Config.pm.in
    ++++ b/etc/RT_Config.pm.in
    +@@
    + =item C<$UserTicketDataResultFormat>
    + 
    + This is the format of ticket search result for "Download User Tickets" links. It
    +-defaults to C<DefaultSearchResultFormat> if it's not set.
    ++defaults to C<DefaultSearchResultFormat> for privileged users and C<DefaultSelfServiceSearchResultFormat>
    ++for unprivileged users if it's not set.
    + 
    + =cut
    + 
     
     diff --git a/share/html/SelfService/Prefs.html b/share/html/SelfService/Prefs.html
     --- a/share/html/SelfService/Prefs.html
    @@ -9,10 +23,7 @@
      <& /Elements/Submit, Label => loc('Save Changes') &>
      </form>
      
    -+% if( RT->Config->Get('SelfServiceDownloadData') ) {
    -+<& /SelfService/User/Elements/RelatedData, UserObj => $user,
    -+&>
    -+% }
    ++<& /SelfService/User/Elements/RelatedData, UserObj => $user &>
      
      <%INIT>
      my @results;
8: f8b70b83f ! 8: 1ffa68e2d Config option to allow self service users to download their user data
    @@ -5,15 +5,6 @@
     diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
     --- a/etc/RT_Config.pm.in
     +++ b/etc/RT_Config.pm.in
    -@@
    - =item C<$DefaultSelfServiceSearchResultFormat>
    - 
    - C<$DefaultSelfServiceSearchResultFormat> is the default format of
    --searches displayed in the SelfService interface.
    -+searches displayed and downloaded in the SelfService interface.
    - 
    - =cut
    - 
     @@
      
      Set($SelfServiceRegex, qr!^(?:/+SelfService/)!x );
    @@ -39,9 +30,10 @@
      <& /Elements/Submit, Label => loc('Save Changes') &>
      </form>
      
    --% if( RT->Config->Get('SelfServiceDownloadData') ) {
    -+% if( RT->Config->Get('SelfServiceDownloadUserData') ) {
    - <& /SelfService/User/Elements/RelatedData, UserObj => $user,
    - &>
    - % }
    ++% if( RT->Config->Get('SelfServiceDownloadData') ) {
    + <& /SelfService/User/Elements/RelatedData, UserObj => $user &>
    ++% }
    + 
    + <%INIT>
    + my @results;
     
9: 5f5965c3f = 9: 1e830b0f1 Create test for user information TSV download