[Rt-commit] rt branch, 5.0/fix-anonymize-user-modal, repushed

[Craig Kaiser]

The branch 5.0/fix-anonymize-user-modal was deleted and repushed:
       was 933b9a7ab3fb099f6681d61d80aae03cd88d9cf7
       now bf806f4958ca97ebaf8504fd53ed5b45b64eacda

1: b209df7f9e = 1: b209df7f9e Remove modal mason component
2: 0013d59c6f ! 2: 9fe3ae1633 Use Bootstrap4 modal for Anonymize User button
    @@ -24,28 +24,32 @@
     -&>
     +<div id="user-info-modal" class="modal">
     +  <div class="modal-dialog modal-dialog-centered">
    -+    <div class="modal-content">
    -+        <div class="modal-header">
    ++    <div class="modal-content p-2">
    ++      <div class="modal-header">
     +        <h5 class="modal-title"><&|/l&>Anonymize User</&></h5>
     +        <a class="close" data-dismiss="modal" aria-label="Close">
     +            <span aria-hidden="true">×</span>
     +        </a>
    -+        </div>
    -+        <div class="modal-body">
    ++      </div>
    ++      <div class="modal-body">
     +        <form action="<% RT->Config->Get('WebPath') %>/Admin/Users/Modify.html" method="POST">
    -+            <input type="hidden" name="id" value="<% $UserObj->Id %>" />
    -+            <input type="hidden" name="Anonymize" value="1" />
    ++          <input type="hidden" name="id" value="<% $UserObj->Id %>" />
    ++          <input type="hidden" name="Anonymize" value="1" />
     +
    ++          <div class="form-row">
     +            <div class="custom-control custom-checkbox">
     +              <input class="custom-control-input" type="checkbox" id="clear_customfields" name="clear_customfields" />
     +              <label class="custom-control-label" for="clear_customfields"><&|/l&>Check to clear user custom fields</&></label>
     +            </div>
    ++          </div>
    ++        </div>
     +
    -+            <div class="modal-footer">
    ++        <div class="form-row justify-content-end">
    ++          <div class="col-auto">
     +            <button type="Submit" class="button"><&|/l&>Anonymize</&></button>
    -+            </div>
    ++          </div>
     +        </form>
    -+        </div>
    ++      </div>
     +    </div>
     +  </div>
     +</div>
    @@ -57,10 +61,14 @@
     --- a/share/html/User/Elements/RelatedData
     +++ b/share/html/User/Elements/RelatedData
     @@
    + 
    + % if ( $session{'CurrentUser'}->HasRight( Object => RT->System, Right => 'AdminUsers' ) ) {
          <div class="title"><&|/l&>Remove User Information</&></div>
    -     <div class="inline-row form-row">
    -         <div class="inline-cell col-4">
    +-    <div class="inline-row form-row">
    +-        <div class="inline-cell col-4">
     -            <a class="button btn btn-primary" href="#user-info-modal" rel="modal:open" name="anonymize_user"><&|/l&>Anonymize User</&></a>
    ++    <div class="form-row">
    ++        <div class="col-4">
     +            <a href="javascript:void(0)" class="button btn btn-primary" data-toggle="modal" data-target="#user-info-modal" name="anonymize_user"><&|/l&>Anonymize User</&></a>
                  <i class="label"><&|/l&>Clear core user data, set anonymous username</&></i>
              </div>
-:  ------- > 3: 57bebc058e Remove inline Bootstrap styling from RelatedData component
3: 933b9a7ab3 = 4: bf806f4958 Update Anonymize user tests for Bootstrap modal