Merge pull request #16633 from nextcloud/backport/15790/stable16

[stable16] remove unncessary code block in share recommendations, fixed undefined var error
This commit is contained in:
Roeland Jago Douma 2019-08-02 19:46:23 +02:00 committed by GitHub
commit 7a1169910a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 18 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -622,23 +622,8 @@
}
previousUuid = grouped[i].uuid;
}
var moreResultsAvailable =
(
oc_config['sharing.maxAutocompleteResults'] > 0
&& Math.min(perPage, oc_config['sharing.maxAutocompleteResults'])
<= Math.max(
users.length + exactUsers.length,
groups.length + exactGroups.length,
remoteGroups.length + exactRemoteGroups.length,
remotes.length + exactRemotes.length,
emails.length + exactEmails.length,
circles.length + exactCircles.length,
rooms.length + exactRooms.length,
lookup.length
)
);
deferred.resolve(result, exactMatches, moreResultsAvailable);
deferred.resolve(result, exactMatches, false);
} else {
deferred.reject(result.ocs.meta.message);
}