wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18013 from nextcloud/bugfix/noid/fix-autocomplete-suggestions-with-numeric-users

Browse source 
Fix autocomplete suggestions with numeric users
This commit is contained in:
Roeland Jago Douma 2019-11-26 11:12:10 +01:00 committed by GitHub
commit 1fac8174b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
apps/comments/js/comments.js
View file

Binary file not shown.

BIN
apps/comments/js/comments.js.map
View file

Binary file not shown.

2
apps/comments/src/commentstabview.js
View file

@ -608,7 +608,7 @@
$comment.find('.avatar-name-wrapper').each(function() {
var $this = $(this)
var $inserted = $this.parent()
var userId = $this.find('.avatar').data('username')
var userId = $this.find('.avatar').data('username').toString()
if (userId.indexOf(' ') !== -1) {
$inserted.html('@"' + userId + '"')
} else {

2
core/Controller/AutoCompleteController.php
View file

@ -107,7 +107,7 @@ class AutoCompleteController extends Controller {
foreach ($results as $type => $subResult) {
foreach ($subResult as $result) {
$output[] = [
'id' => $result['value']['shareWith'],
'id' => (string) $result['value']['shareWith'],
'label' => $result['label'],
'source' => $type,
];

5
lib/private/Collaboration/Collaborators/UserPlugin.php
View file

@ -71,7 +71,7 @@ class UserPlugin implements ISearchPlugin {
foreach ($userGroups as $userGroup) {
$usersTmp = $this->groupManager->displayNamesInGroup($userGroup, $search, $limit, $offset);
foreach ($usersTmp as $uid => $userDisplayName) {
$users[$uid] = $userDisplayName;
$users[(string) $uid] = $userDisplayName;
}
}
} else {
@ -80,7 +80,7 @@ class UserPlugin implements ISearchPlugin {
foreach ($usersTmp as $user) {
if ($user->isEnabled()) { // Don't keep deactivated users
$users[$user->getUID()] = $user->getDisplayName();
$users[(string) $user->getUID()] = $user->getDisplayName();
}
}
}
@ -94,6 +94,7 @@ class UserPlugin implements ISearchPlugin {
$foundUserById = false;
$lowerSearch = strtolower($search);
foreach ($users as $uid => $userDisplayName) {
$uid = (string) $uid;
if (strtolower($uid) === $lowerSearch || strtolower($userDisplayName) === $lowerSearch) {
if (strtolower($uid) === $lowerSearch) {
$foundUserById = true;

2
lib/private/Group/Manager.php
View file

@ -392,7 +392,7 @@ class Manager extends PublicEmitter implements IGroupManager {
$matchingUsers = [];
foreach ($groupUsers as $groupUser) {
$matchingUsers[$groupUser->getUID()] = $groupUser->getDisplayName();
$matchingUsers[(string) $groupUser->getUID()] = $groupUser->getDisplayName();
}
return $matchingUsers;
}