[Rt-commit] rt branch, 4.4/remove-user-info, repushed
Craig Kaiser
craig at bestpractical.com
Thu Jan 3 12:37:00 EST 2019
The branch 4.4/remove-user-info was deleted and repushed:
was 1986cd4e7d2936ac571bde10c59eced5389ce150
now 733604309bb623be59fa4ba7da093d5543c44c09
--: ------- > 1: 5d3e802e0f Add test for contents of user session
--: ------- > 2: f82c158637 Move session cache code to a function for easier access
--: ------- > 3: 901d140308 Add caching to the queue list portlet
--: ------- > 4: 7b5ae70bcb Update other portlets using SummaryByStatus
--: ------- > 5: a09da6a339 Clear queue list caches after pref change
--: ------- > 6: 7cb23c4e58 Show system default value for Timezone
--: ------- > 7: c83ca7b871 Show system default value for Lang
1: 7683adbe21 = 8: 209f0c1bf2 Remove user related data download links on "About Me" page of priviged users
2: a73494e8e6 = 9: d2036040de Allow TSVExport filename to be set through Filename arg
3: 5a8673412f < --: ------- Set filename of downloaded user related tsv data
--: ------- > 10: 47cdd92123 Set filename of downloaded user related tsv data
4: 20e809325a = 11: c2c7b589ea Add Timezone info to user related data
5: fca10a9820 = 12: 9e524c99bb Update title of ObjectId in $UserTransactionDataResultFormat
6: a4d10d41cb = 13: 432139e9fd No need to show "Download User ..." buttons on user create page
7: 4f8878effb = 14: 4a75abe33a Move User related info portlet into side column
8: eaca3ea66d = 15: 0353ae0a78 Create method AnonymizeUser in User.pm
9: 6758ab11f3 = 16: 5aa4123c2b Create modal mason component
10: d258b7725c ! 17: f7b0ddb75e Enhance "User related info" with actions of clearing user info
@@ -8,7 +8,6 @@
shredder page with a pre formatted search.
With added actions, "Manage user data" is a more appropriate name.
- Portlet
diff --git a/share/html/Admin/Users/Modify.html b/share/html/Admin/Users/Modify.html
--- a/share/html/Admin/Users/Modify.html
@@ -60,22 +59,22 @@
&>
-<div>
-- <a href="/User/RelatedData.tsv?Type=User&id=<% $UserObj->id %>&Filename=UserData.tsv" class="button"><% $UserDataButton %></a>
-- <a href="/Search/Results.tsv?Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>&Filename=UserTicketData.tsv" class="button"><% $UserTicketsButton %></a>
-- <a href="/User/RelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>&Filename=UserTransactionData.tsv" class="button"><% $UserTxnButton %></a>
+- <a href="/User/RelatedData.tsv?Type=User&id=<% $UserObj->id %>" class="button"><% $UserDataButton %></a>
+- <a href="/Search/Results.tsv?UserData=1&Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>" class="button"><% $UserTicketsButton %></a>
+- <a href="/User/RelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>" class="button"><% $UserTxnButton %></a>
+<div id="manage-user-data">
+ <div class="title"><&|/l&>Download User Information</&></div>
+ <div class="download-user-data-buttons inline-row">
+ <div class="inline-cell">
-+ <a class="button" href="/User/RelatedData.tsv?Type=User&id=<% $UserObj->id %>&Filename=UserData.tsv"><% $UserDataButton %></a>
++ <a class="button" href="/User/RelatedData.tsv?Type=User&id=<% $UserObj->id %>"><% $UserDataButton %></a>
+ <i class="label"><&|/l&>The basic user info</&></i>
+ </div>
+ <div class="inline-cell">
-+ <a class="button" href="/Search/Results.tsv?Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>&Filename=UserTicketData.tsv"><% $UserTicketsButton %></a>
++ <a class="button" href="/Search/Results.tsv?UserData=1&Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>"><% $UserTicketsButton %></a>
+ <i class="label"><&|/l&>Tickets with the user as a requestor</&></i>
+ </div>
+ <div class="inline-cell">
-+ <a class="button" href="/User/RelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>&Filename=UserTransactionData.tsv"><% $UserTxnButton %></a>
++ <a class="button" href="/User/RelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>"><% $UserTxnButton %></a>
+ <i class="label"><&|/l&>Ticket transactions the user created</&></i>
+ </div>
+ </div>
11: 9385aece79 = 18: 767e5468f5 Create test for remove user information
12: a30efb95bc < --: ------- Update download user info tests
13: a488b2f99a ! 19: fe113f9225 Update download user info tests
@@ -1,6 +1,9 @@
-Author: Jim Brandt <jbrandt at bestpractical.com>
+Author: Craig Kaiser <craig at bestpractical.com>
- Refine user data button help text
+ Update download user info tests
+
+ Adding Timzeone and ObjectId for transactions requires tests to be
+ updated.
diff --git a/share/html/SelfService/User/Elements/RelatedData b/share/html/SelfService/User/Elements/RelatedData
--- a/share/html/SelfService/User/Elements/RelatedData
@@ -13,21 +16,21 @@
+ title => loc("Download My Data"),
&>
--<div>
-- <a href="/SelfService/User/RelatedData.tsv?Type=User&id=<% $UserObj->id %>&Filename=UserData.tsv" class="button"><% $UserDataButton %></a>
-- <a href="/SelfService/Search/Results.tsv?Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>&Filename=UserTicketData.tsv" class="button"><% $UserTicketsButton %></a>
-- <a href="/SelfService/User/RelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>&Filename=UserTransactionData.tsv" class="button"><% $UserTxnButton %></a>
+ <div>
+- <a href="/SelfService/User/RelatedData.tsv?Type=User&id=<% $UserObj->id %>" class="button"><% $UserDataButton %></a>
+- <a href="/SelfService/Search/Results.tsv?Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>" class="button"><% $UserTicketsButton %></a>
+- <a href="/SelfService/User/RelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>" class="button"><% $UserTxnButton %></a>
+<div id="download-my-data" class="inline-row">
+ <div class="inline-cell">
-+ <a href="/SelfService/User/RelatedData.tsv?Type=User&id=<% $UserObj->id %>&Filename=UserData.tsv" class="button"><% $UserDataButton %></a>
++ <a href="/SelfService/User/RelatedData.tsv?Type=User&id=<% $UserObj->id %>" class="button"><% $UserDataButton %></a>
+ <i class="label"><&|/l&>Base user data</&></i>
+ </div>
+ <div class="inline-cell">
-+ <a href="/SelfService/Search/Results.tsv?Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>&Filename=UserTicketData.tsv" class="button"><% $UserTicketsButton %></a>
++ <a href="/SelfService/Search/Results.tsv?Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>" class="button"><% $UserTicketsButton %></a>
+ <i class="label"><&|/l&>Tickets with you as a requestor</&></i>
+ </div>
+ <div class="inline-cell">
-+ <a href="/SelfService/User/RelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>&Filename=UserTransactionData.tsv" class="button"><% $UserTxnButton %></a>
++ <a href="/SelfService/User/RelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>" class="button"><% $UserTxnButton %></a>
+ <i class="label"><&|/l&>Replies you sent</&></i>
+ </div>
</div>
@@ -51,17 +54,17 @@
@@
<div class="download-user-data-buttons inline-row">
<div class="inline-cell">
- <a class="button" href="/User/RelatedData.tsv?Type=User&id=<% $UserObj->id %>&Filename=UserData.tsv"><% $UserDataButton %></a>
+ <a class="button" href="/User/RelatedData.tsv?Type=User&id=<% $UserObj->id %>"><% $UserDataButton %></a>
- <i class="label"><&|/l&>The basic user info</&></i>
+ <i class="label"><&|/l&>Core user data</&></i>
</div>
<div class="inline-cell">
- <a class="button" href="/Search/Results.tsv?Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>&Filename=UserTicketData.tsv"><% $UserTicketsButton %></a>
+ <a class="button" href="/Search/Results.tsv?UserData=1&Query=Requestor.id=<% $UserObj->id %>&Format=<% $Format | un %>"><% $UserTicketsButton %></a>
- <i class="label"><&|/l&>Tickets with the user as a requestor</&></i>
+ <i class="label"><&|/l&>Tickets with this user as a requestor</&></i>
</div>
<div class="inline-cell">
- <a class="button" href="/User/RelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>&Filename=UserTransactionData.tsv"><% $UserTxnButton %></a>
+ <a class="button" href="/User/RelatedData.tsv?Type=Transaction&id=<% $UserObj->id %>"><% $UserTxnButton %></a>
- <i class="label"><&|/l&>Ticket transactions the user created</&></i>
+ <i class="label"><&|/l&>Ticket transactions this user created</&></i>
</div>
@@ -102,3 +105,44 @@
}
+diff --git a/t/web/download_user_info.t b/t/web/download_user_info.t
+--- a/t/web/download_user_info.t
++++ b/t/web/download_user_info.t
+@@
+
+ # TSV file for user record information
+ $agent->get_ok( $url . "Admin/Users/Modify.html?id=" . $root->id );
+- $agent->follow_link_ok( { text => 'Download User Data' } );
++ $agent->follow_link_ok( { text => 'User Data' } );
+
+ my $user_info_tsv = <<EOF;
+-id\tName\tEmailAddress\tRealName\tNickName\tOrganization\tHomePhone\tWorkPhone\tMobilePhone\tPagerPhone\tAddress1\tAddress2\tCity\tState\tZip\tCountry\tGecos\tLang\tFreeFormContactInfo
+-14\troot\troot\@localhost\tEnoch Root\t\t\t\t\t\t\t\t\t\t\t\t\troot\t\t
++id\tName\tEmailAddress\tRealName\tNickName\tOrganization\tHomePhone\tWorkPhone\tMobilePhone\tPagerPhone\tAddress1\tAddress2\tCity\tState\tZip\tCountry\tGecos\tLang\tTimezone\tFreeFormContactInfo
++14\troot\troot\@localhost\tEnoch Root\t\t\t\t\t\t\t\t\t\t\t\t\troot\t\t\t
+ EOF
+
+ is $agent->content, $user_info_tsv,
+@@
+
+ # TSV file for Transactions
+ $agent->get_ok( $url . "Admin/Users/Modify.html?id=" . $root->id );
+- $agent->follow_link_ok( { text => 'Download User Transaction Data' } );
++ $agent->follow_link_ok( { text => 'User Transactions' } );
+
+ my $transaction_info_tsv = <<EOF;
+-ObjectId\tid\tCreated\tDescription\tOldValue\tNewValue\tContent
++Ticket Id\tid\tCreated\tDescription\tOldValue\tNewValue\tContent
+ 1\t30\t$date_created\tTicket created\t\t\tThis transaction appears to have no content
+ 1\t32\t$date_commented\tComments added\t\t\tTest - Comment
+ 1\t33\t$date_correspondence\tCorrespondence added\t\t\tTest - Reply
+@@
+
+ # TSV file for user's Tickets
+ $agent->get_ok( $url . "Admin/Users/Modify.html?id=" . $root->id );
+- $agent->follow_link_ok( { text => 'Download User Tickets' } );
++ $agent->follow_link_ok( { text => 'User Tickets' } );
+
+ my $ticket_info_tsv = <<EOF;
+ id\tSubject\tStatus\tQueueName\tOwner\tPriority\tRequestors
+
14: 1986cd4e7d = 20: 733604309b Clarify self service download config docs
More information about the rt-commit
mailing list