Skip to content

[stable20] Show federation and email results also with exact user match unless c… #23085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Sep 29, 2020
Merged

[stable20] Show federation and email results also with exact user match unless c… #23085

merged 1 commit into from
Sep 29, 2020

Conversation

backportbot-nextcloud[bot]
Copy link

backport of #23013

@nickvergessen @backportbot
Show federation and email results also with exact user match unless c…
71b33fb 
…ontaining @

Before when you have a user "smith" and a federated user "smith@example.com"
you could see the federation result with "smit" but not with "smith" anymore.
With most LDAP configurations and local backend setups this is disturbing and
causes issues.
The idea of not showing the email and federation on a matching user was with:
Local user registered with "smith@example.com" user id and having that same
email / cloud id in your contacts addressbook. So we now only hide those
"side results" when the search does contain an @

Signed-off-by: Joas Schilling <coding@schilljs.com>
@backportbot-nextcloud backportbot-nextcloud bot added this to the Nextcloud 20 milestone Sep 29, 2020
@rullzer rullzer added the 3. to review Waiting for reviews label Sep 29, 2020
@faily-bot
Copy link

faily-bot bot commented Sep 29, 2020

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 33451: failure

jsunit

Show full log 
PhantomJS 2.1.1 (Linux 0.0.0) WARN: 'No OC found'
PhantomJS 2.1.1 (Linux 0.0.0) LOG: 'JQMIGRATE: Migrate is installed, version 1.4.1'
PhantomJS 2.1.1 (Linux 0.0.0) WARN: 'jQuery is deprecated: The global jQuery is deprecated. It will be updated to v3.x in Nextcloud 21. In later versions of Nextcloud it might be removed completely. Please ship your own.'
PhantomJS 2.1.1 (Linux 0.0.0) WARN: '$ is deprecated: The global jQuery is deprecated. It will be updated to v3.x in Nextcloud 21. In later versions of Nextcloud it might be removed completely. Please ship your own.'
PhantomJS 2.1.1 (Linux 0.0.0) WARN: 'Handlebars is deprecated: please ship your own, this will be removed in Nextcloud 20'
PhantomJS 2.1.1 (Linux 0.0.0) DEBUG: 'OCA.Files.Settings initialized'
PhantomJS 2.1.1 (Linux 0.0.0) DEBUG: 'OCA.Files.Sidebar initialized'
PhantomJS 2.1.1 (Linux 0.0.0) DEBUG: 'OCA.Sharing.ShareSearch initialized'
PhantomJS 2.1.1 (Linux 0.0.0) DEBUG: 'OCA.Sharing.ExternalLinkActions initialized'
PhantomJS 2.1.1 (Linux 0.0.0): Executed 847 of 850 (skipped 3) SUCCESS (15.529 secs / 14.638 secs)

mariadb10.1-php7.2

Show full log 
There were 2 warnings:

1) Test\Files\ViewTest::testRenameFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

2) Test\Files\ViewTest::testCopyFailDeleteTargetKeepSource
Trying to configure method "writeStream" which cannot be configured because it does not exist, has not been specified, is final, or is static

--

There was 1 failure:

1) Test\Files\ObjectStore\ObjectStoreStorageTest::testCopyDirectory
Failed asserting that false is true.

/drone/src/tests/lib/Files/Storage/Storage.php:550

@rullzer rullzer merged commit f72ebcd into stable20 Sep 29, 2020
@rullzer rullzer deleted the backport/23013/stable20 branch September 29, 2020 10:16
@rullzer rullzer mentioned this pull request Sep 29, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rullzer rullzer rullzer approved these changes

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@blizzz blizzz Awaiting requested review from blizzz

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@MorrisJobke MorrisJobke Awaiting requested review from MorrisJobke

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

Assignees
No one assigned
Labels
3. to review Waiting for reviews bug feature: federation feature: sharing
Projects
None yet
Milestone
Nextcloud 20
Development

Successfully merging this pull request may close these issues.
3 participants
@rullzer @ChristophWurst @nickvergessen