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

[Craig Kaiser]

The branch 4.4/remove-user-info was deleted and repushed:
       was a941111849304b64caec21e206db1c16a896aad2
       now 30d0ade0a5b29ba2db9851362189e63f0bfef037

1: 8b6402eb0 = 1: 8b6402eb0 Add GenerateAnonymousName function for RT::User
2: 1a5f99e25 = 2: 1a5f99e25 Create method AnonymizeUser in User.pm
-:  ------- > 3: 0b50f1b1a Create modal mason component
-:  ------- > 4: efb956161 Add modal to modify page
3: 0f47bb18f ! 5: fe07c9386 Create portlet for removing user information
    @@ -8,10 +8,10 @@
         information from the user record. 'Replace User' and 'Remove User' will
         link to the shredder page with a pre formatted search.
     
    -diff --git a/share/html/Elements/MyRelatedInfo b/share/html/Elements/MyRelatedInfo
    +diff --git a/share/html/Elements/UserRelatedInfo b/share/html/Elements/UserRelatedInfo
     new file mode 100644
     --- /dev/null
    -+++ b/share/html/Elements/MyRelatedInfo
    ++++ b/share/html/Elements/UserRelatedInfo
     @@
     +%# BEGIN BPS TAGGED BLOCK {{{
     +%#
    @@ -60,31 +60,28 @@
     +%# those contributions and any derivatives thereof.
     +%#
     +%# END BPS TAGGED BLOCK }}}
    -+<div class="modal" id="user-info-modal" align="center">
    -+    <form id="anonymize_user_form" method="GET" action="/Admin/Users/Modify.html">
    -+        <p>Are you sure you want to anonymize user: <% $session{'CurrentUser'}->Name %>?</p>
    -+        <p>
    -+           Check to clear user customfields:
    -+            <input name="clear_customfields" type="checkbox" class="checkbox">
    -+        </p>
    -+
    -+        <button type="submit" class="button"><&|/l&>Ok</&></button>
    -+        <a href="#" rel="modal:close" class="button"><&|/l&>Cancel</&></a>
    -+        <input type="hidden" name="id" value="<% $session{'CurrentUser'}->id %>">
    -+        <input type="hidden" name="Anonymize" value=1>
    -+    </form>
    -+</div>
    ++% if ( $UserObj && $UserObj->Id ) {
     +<&|/Widgets/TitleBox,
     +    class => 'user-related-info',
     +    title => loc("User related info"),
     +&>
     +
    -+<div>
    -+    <div>
    -+        <a href="#user-info-modal" rel="modal:open" class="button" name="anonymize_user"><&|/l&>Anonymize User</&></a>
    -+        <a href="/Admin/Tools/Shredder/index.html?Plugin=Users&Users%3Astatus=enabled&Users%3Aname=<% $session{'CurrentUser'}->Name %>&Users%3Areplace_relations=nobody&Search=Search" name="replace-user" class="button"><&|/l&>Replace User Information</&></a>
    -+        <a href="/Admin/Tools/Shredder/index.html?Plugin=Users&Users%3Astatus=enabled&Users%3Aname=<% $session{'CurrentUser'}->Name %>&Search=Search&remove_user" class="button" name="remove-user"><&|/l&>Remove User Information</&></a>
    -+    </div>
    -+</div>
    ++<table>
    ++    <tr>
    ++        <td class="label"><&|/l&>Remove user information and add anonymous username</&>:</td>
    ++        <td class="value"><a href="#user-info-modal" rel="modal:open" class="button value" name="anonymize_user"><&|/l&>Anonymize</&></a></td>
    ++    </tr><tr>
    ++        <td class="label"><&|/l&>Replace user links in DB with "Nobody" user</&>:</td>
    ++        <td class="value"><a href="/Admin/Tools/Shredder/index.html?Plugin=Users&Users%3Astatus=enabled&Users%3Aname=<% $UserObj->Name %>&Users%3Areplace_relations=Nobody&Search=Search" name="replace-user" class="button value"><&|/l&>Replace</&></a></td>
    ++    </tr><tr>
    ++        <td class="label"><&|/l&>Remove all references to user and links to user</&>:</td>
    ++        <td class="value"><a href="/Admin/Tools/Shredder/index.html?Plugin=Users&Users%3Astatus=enabled&Users%3Aname=<% $UserObj->Name %>&Search=Search&remove_user" class="button value" name="remove-user"><&|/l&>Remove</&></a></td>
    ++    </tr>
    ++</table>
    ++
     +</&>
    ++% }
    ++<%ARGS>
    ++$UserObj
    ++</%ARGS>
     
4: 5e8f01c1d < -:  ------- Add remove user info portlet to user modify page
-:  ------- > 6: 2412b742d Add remove user info portlet to user modify page
5: a94111184 ! 7: 30d0ade0a Create test for remove user information
    @@ -30,13 +30,12 @@
     +    my $user_id = $root->id;
     +
     +    $agent->get_ok( $url . "Admin/Users/Modify.html?id=" . $user_id );
    -+    $agent->follow_link_ok( { text => 'Anonymize User' } );
    ++    $agent->follow_link_ok( { text => 'Anonymize' } );
     +
    -+    $agent->submit_form_ok( { form_id => 'anonymize_user_form', },
    ++    $agent->submit_form_ok( { form_id => 'user-info-modal', },
     +        "Anonymize user" );
     +
     +    is $root->ValidateEmail('root at example.com'), 1, 'User Email removed';
    -+    is $root->ValidateName( $root->Name ), 1, 'Username anonymized';
     +
     +# UserId is still the same, but all other records should be anonimyzed for TestUser
     +    my ( $ret, $msg ) = $root->Load($user_id);
    @@ -77,10 +76,10 @@
     +        'Customfield exists and has value for user.';
     +
     +    $agent->get_ok( $url . "Admin/Users/Modify.html?id=" . $root->id );
    -+    $agent->follow_link_ok( { text => 'Anonymize User' } );
    ++    $agent->follow_link_ok( { text => 'Anonymize' } );
     +
     +    $agent->submit_form_ok(
    -+        {   form_id => 'anonymize_user_form',
    ++        {   form_id => 'user-info-modal',
     +            fields  => { clear_customfields => 'On' },
     +        },
     +        "Anonymize user and customfields"
    @@ -109,7 +108,7 @@
     +    ok $agent->login( 'root' => 'password' );
     +
     +    $agent->get_ok( $url . "Admin/Users/Modify.html?id=" . $root->id );
    -+    $agent->follow_link_ok( { text => 'Replace User Information' } );
    ++    $agent->follow_link_ok( { text => 'Replace' } );
     +
     +    $agent->submit_form_ok(
     +        {   form_id => 'shredder-search-form',
    @@ -142,7 +141,7 @@
     +    $agent->login( 'root' => 'password' );
     +
     +    $agent->get_ok( $url . "Admin/Users/Modify.html?id=" . $root->id );
    -+    $agent->follow_link_ok( { text => 'Remove User Information' } );
    ++    $agent->follow_link_ok( { text => 'Remove' } );
     +
     +    $agent->submit_form_ok(
     +        {   form_id => 'shredder-search-form',