Skip to content

Commit 5bf3774

Browse files
Merge pull request #11201 from nextcloud/backport/11036/stable14
[stable14] fix check for more users in sharing dialogue
2 parents 2823d7a + 72588b6 commit 5bf3774

2 files changed

Lines changed: 224 additions & 71 deletions

File tree

core/js/sharedialogview.js

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,23 @@
326326

327327
var suggestions = exactMatches.concat(users).concat(groups).concat(remotes).concat(remoteGroups).concat(emails).concat(circles).concat(rooms).concat(lookup);
328328

329-
deferred.resolve(suggestions, exactMatches);
329+
var moreResultsAvailable =
330+
(
331+
oc_config['sharing.maxAutocompleteResults'] > 0
332+
&& Math.min(perPage, oc_config['sharing.maxAutocompleteResults'])
333+
<= Math.max(
334+
users.length + exactUsers.length,
335+
groups.length + exactGroups.length,
336+
remoteGroups.length + exactRemoteGroups.length,
337+
remotes.length + exactRemotes.length,
338+
emails.length + exactEmails.length,
339+
circles.length + exactCircles.length,
340+
rooms.length + exactRooms.length,
341+
lookup.length
342+
)
343+
);
344+
345+
deferred.resolve(suggestions, exactMatches, moreResultsAvailable);
330346
} else {
331347
deferred.reject(result.ocs.meta.message);
332348
}
@@ -380,12 +396,12 @@
380396
$shareWithField.removeClass('error')
381397
.tooltip('hide');
382398

383-
var perPage = 200;
399+
var perPage = parseInt(oc_config['sharing.maxAutocompleteResults'], 10) || 200;
384400
this._getSuggestions(
385401
search.term.trim(),
386402
perPage,
387403
view.model
388-
).done(function(suggestions) {
404+
).done(function(suggestions, exactMatches, moreResultsAvailable) {
389405
view._pendingOperationsCount--;
390406
if (view._pendingOperationsCount === 0) {
391407
$loading.addClass('hidden');
@@ -401,10 +417,7 @@
401417

402418
// show a notice that the list is truncated
403419
// this is the case if one of the search results is at least as long as the max result config option
404-
if(oc_config['sharing.maxAutocompleteResults'] > 0 &&
405-
Math.min(perPage, oc_config['sharing.maxAutocompleteResults'])
406-
<= Math.max(users.length, groups.length, remotes.length, emails.length, lookup.length)) {
407-
420+
if(moreResultsAvailable) {
408421
var message = t('core', 'This list is maybe truncated - please refine your search term to see more results.');
409422
$('.ui-autocomplete').append('<li class="autocomplete-note">' + message + '</li>');
410423
}
@@ -557,7 +570,7 @@
557570
$shareWithField.focus();
558571
};
559572

560-
var perPage = 200;
573+
var perPage = parseInt(oc_config['sharing.maxAutocompleteResults'], 10) || 200;
561574
var onlyExactMatches = true;
562575
this._getSuggestions(
563576
$shareWithField.val(),

0 commit comments

Comments
 (0)