upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

clean search when new user is added

Browse source 
Signed-off-by: giorgia <g.sambrotta@gmail.com>
This commit is contained in:
giorgia 2017-03-03 14:44:16 +01:00
parent abc48f9e91
commit 3afc16bf77
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
settings/js/users/users.js
View file

@ -10,6 +10,7 @@
var $userList;
var $userListBody;
var $emptyContainer;
var UserDeleteHandler;
var UserList = {
@ -383,7 +384,6 @@ var UserList = {
}
UserList.currentGid = gid;
var pattern = this.filter;
var emptyContainer = $userList.siblings('.emptycontent');
$.get(
OC.generateUrl('/settings/users/users'),
{ offset: UserList.offset, limit: limit, gid: gid, pattern: pattern },
@ -404,15 +404,18 @@ var UserList = {
// reset state on load
UserList.noMoreEntries = false;
$userListHead.show();
emptyContainer.hide();
emptyContainer.find('h2 strong').html();
$emptyContainer.hide();
$emptyContainer.find('h2').text('');
}
else {
UserList.noMoreEntries = true;
$userList.siblings('.loading').remove();
$userListHead.hide();
emptyContainer.show();
emptyContainer.find('h2 strong').html(pattern);
if (pattern !== ""){
$userListHead.hide();
$emptyContainer.show();
$emptyContainer.find('h2').html(t('settings', 'No user found for <strong>{pattern}</strong>', {pattern: pattern}));
}
}
UserList.offset += limit;
}).always(function() {
@ -677,6 +680,7 @@ $(document).ready(function () {
$userList = $('#userlist');
$userListBody = $userList.find('tbody');
$userListHead = $userList.find('thead');
$emptyContainer = $userList.siblings('.emptycontent');
UserList.initDeleteHandling();
@ -908,6 +912,13 @@ $(document).ready(function () {
$(this).find('#default_quota').singleSelect().on('change', UserList.onQuotaSelect);
});
$('#newuser input').click(function() {
// empty the container also here to avoid visual delay
$emptyContainer.hide();
OC.Search = new OCA.Search($('#searchbox'), $('#searchresults'));
OC.Search.clear();
});
UserList._updateGroupListLabel($('#newuser .groups'), []);
var _submitNewUserForm = function (event) {
event.preventDefault();

2
settings/templates/users/part.userlist.php
View file

@ -70,5 +70,5 @@
<div class="emptycontent" style="display:none">
<div class="icon-search"></div>
<h2><?php p($l->t("No user found for '"));?><strong></strong>' </h2>
<h2></h2>
</div>