upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Fix autocomplete suggestions with numeric user ids

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2019-11-19 16:43:46 +01:00 committed by Roeland Jago Douma
parent 0fab27f459
commit 06f97c0fd0
No known key found for this signature in database
GPG key ID: F941078878347C0C
6 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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;
}