From c38548a1aa47fb53c61da8f54427ac923c7fdc64 Mon Sep 17 00:00:00 2001
From: ringmaster <epithet@gmail.com>
Date: Thu, 8 May 2014 09:42:55 -0400
Subject: [PATCH] Rebase cleanup.
Removing code that should not have been restored.
Originally removed in 45fd8f6d.
---
settings/js/users/users.js | 1 -
settings/templates/users/part.createuser.php | 1 -
2 files changed, 2 deletions(-)
diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index cd81a4b771..48586b485d 100644
--- 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 adddc418a9..4d573168fc 100644
--- 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
--
GitLab