Skip to content
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.

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

[stable18] dont show remote and email options if we have an exact match for local user email #20574

Merged
merged 1 commit into from
May 12, 2020

Conversation

backportbot-nextcloud[bot]
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Apr 21, 2020

backport of #16035

Fixes #20359

@skjnldsv skjnldsv added the high label Apr 21, 2020
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good 👍

@MorrisJobke
Copy link
Member

CI fails:

There were 6 errors:
134	
135	1) Test\Collaboration\Collaborators\UserPluginTest::testSearch with data set #10 ('test', false, true, array(), array(Mock_IUser_c8fdc090 Object (...)), array(), array(array('Test One', array(0, 'test1'))), true, false)
136	Error: Call to a member function getDisplayName() on string
137	
138	/drone/src/lib/private/Collaboration/Collaborators/UserPlugin.php:101
139	/drone/src/tests/lib/Collaboration/Collaborators/UserPluginTest.php:458
140	
141	2) Test\Collaboration\Collaborators\UserPluginTest::testSearch with data set #11 ('test', false, false, array(), array(Mock_IUser_c8fdc090 Object (...)), array(), array(), true, false)
142	Error: Call to a member function getDisplayName() on string
143	
144	/drone/src/lib/private/Collaboration/Collaborators/UserPlugin.php:101
145	/drone/src/tests/lib/Collaboration/Collaborators/UserPluginTest.php:458
146	
147	3) Test\Collaboration\Collaborators\UserPluginTest::testSearch with data set #12 ('test', false, true, array(), array(Mock_IUser_c8fdc090 Object (...), Mock_IUser_c8fdc090 Object (...)), array(), array(array('Test One', array(0, 'test1')), array('Test Two', array(0, 'test2'))), false, false)
148	Error: Call to a member function getDisplayName() on string
149	
150	/drone/src/lib/private/Collaboration/Collaborators/UserPlugin.php:101
151	/drone/src/tests/lib/Collaboration/Collaborators/UserPluginTest.php:458
152	
153	4) Test\Collaboration\Collaborators\UserPluginTest::testSearch with data set #13 ('test', false, false, array(), array(Mock_IUser_c8fdc090 Object (...), Mock_IUser_c8fdc090 Object (...)), array(), array(), true, false)
154	Error: Call to a member function getDisplayName() on string
155	
156	/drone/src/lib/private/Collaboration/Collaborators/UserPlugin.php:101
157	/drone/src/tests/lib/Collaboration/Collaborators/UserPluginTest.php:458
158	
159	5) Test\Collaboration\Collaborators\UserPluginTest::testSearch with data set #14 ('test', false, true, array(), array(Mock_IUser_c8fdc090 Object (...), Mock_IUser_c8fdc090 Object (...), Mock_IUser_c8fdc090 Object (...)), array(array('Test', array(0, 'test0'))), array(array('Test One', array(0, 'test1')), array('Test Two', array(0, 'test2'))), false, false)
160	Error: Call to a member function getDisplayName() on string
161	
162	/drone/src/lib/private/Collaboration/Collaborators/UserPlugin.php:101
163	/drone/src/tests/lib/Collaboration/Collaborators/UserPluginTest.php:458
164	
165	6) Test\Collaboration\Collaborators\UserPluginTest::testSearch with data set #15 ('test', false, false, array(), array(Mock_IUser_c8fdc090 Object (...), Mock_IUser_c8fdc090 Object (...), Mock_IUser_c8fdc090 Object (...)), array(array('Test', array(0, 'test0'))), array(), true, false)
166	Error: Call to a member function getDisplayName() on string
167	
168	/drone/src/lib/private/Collaboration/Collaborators/UserPlugin.php:101
169	/drone/src/tests/lib/Collaboration/Collaborators/UserPluginTest.php:458

@wiswedel
Copy link
Contributor

doesn't work for me with 18.0.4. Sharee search field keeps spinning forever, even if matching email address is entered. Now not even guest invitation gets offered.

@wiswedel
Copy link
Contributor

in 19 beta however it works. But we need the backport to work as well.

@skjnldsv
Copy link
Member

doesn't work for me with 18.0.4. Sharee search field keeps spinning forever, even if matching email address is entered. Now not even guest invitation gets offered.

This pr is for 18.0.5 🤔

@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels May 3, 2020
@wiswedel
Copy link
Contributor

wiswedel commented May 5, 2020

So what now? Can this be patched into an 18.0.3 or 18.0.4, or are there other dependencies coming with 18.0.5 only? Customer is waiting.

@skjnldsv
Copy link
Member

skjnldsv commented May 5, 2020

@icewind1991 ?
edit: Rebased in the meantime

@skjnldsv skjnldsv force-pushed the backport/16035/stable18 branch from ce4fcb7 to 1cf1bc9 Compare May 5, 2020 10:25
Copy link
Member

@MorrisJobke MorrisJobke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CI fails

@MorrisJobke MorrisJobke added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels May 6, 2020
…l user email

Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 force-pushed the backport/16035/stable18 branch from 1cf1bc9 to e26c055 Compare May 12, 2020 14:31
@icewind1991
Copy link
Member

Ci is happy

@MorrisJobke MorrisJobke added 3. to review Waiting for reviews and removed 2. developing Work in progress labels May 12, 2020
@MorrisJobke MorrisJobke merged commit de4a71c into stable18 May 12, 2020
@MorrisJobke MorrisJobke deleted the backport/16035/stable18 branch May 12, 2020 19:06
@rullzer rullzer mentioned this pull request May 21, 2020
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants