Rebase cleanup.

Removing code that should not have been restored.
Originally removed in 45fd8f6d.

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index cd81a4b7718f9ac2a5ee3eefc6daa372962f8726..48586b485d537f7aa37d6d9cbf73c157fda2424b 100644 (file)
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -455,7 +455,6 @@ $(document).ready(function () {
 
        // Implements User Search
        filter = new UserManagementFilter($('#usersearchform input'), UserList, GroupList);
-       filter.addResetButton($('.userFilterReset').first());
 
        UserList.doSort();
        UserList.availableGroups = $userList.data('groups');

diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
index adddc418a908e2a28406d58e48cd0e1db4404a2b..4d573168fc1fd00ae66dabf4d8f16a7f7a5af515 100644 (file)
--- a/settings/templates/users/part.createuser.php
+++ b/settings/templates/users/part.createuser.php
@@ -30,6 +30,5 @@
        <?php endif; ?>
        <form autocomplete="off" id="usersearchform">
                <input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users and Groups')); ?>" />
-               <span class="svg icon-delete userFilterReset"></span>
        </form>
 </div>
\ No newline at end of file