Skip to content

Also array_slice wide email matches of local users - #8596

Merged
MorrisJobke merged 2 commits into
masterfrom
bugfix/8454/sharee-email-matches-not-limited
Mar 6, 2018
Merged

Also array_slice wide email matches of local users#8596
MorrisJobke merged 2 commits into
masterfrom
bugfix/8454/sharee-email-matches-not-limited

Conversation

@nickvergessen

@nickvergessennickvergessen commented Mar 1, 2018

Copy link
Copy Markdown
Member

@nickvergessen
Also array_slice wide email matches of local users
12420ae
Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessennickvergessen added this to the Nextcloud 14 milestone Mar 1, 2018
juliusknorr
juliusknorr approved these changes Mar 1, 2018
View reviewed changes

@juliusknorrjuliusknorr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Works as expected now 👍 Thanks @nickvergessen

nickvergessen
nickvergessen commented Mar 1, 2018
View reviewed changes
Comment threadlib/private/Collaboration/Collaborators/MailPlugin.php

if (!$this->shareeEnumeration) {
$result['wide'] = [];
$userResults['wide'] = [];

@nickvergessennickvergessenMar 1, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

PS: also enumeration was possible before, pretty bad...

rullzer
rullzer approved these changes Mar 1, 2018
View reviewed changes

@rullzerrullzer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yes please!

@rullzer

rullzer commented Mar 1, 2018

Copy link
Copy Markdown
Member

Ah failing tests

@nickvergessen
Add the users result only when non empty so tests stay the same
e05f338
Signed-off-by: Joas Schilling <coding@schilljs.com>
@codecov

codecovBot commented Mar 2, 2018

Copy link
Copy Markdown

Codecov Report

Merging #8596 into master will decrease coverage by 16.9%.
The diff coverage is 0%.

@@ Coverage Diff @@## master #8596 +/- ##
=============================================
- Coverage 51.93% 35.02% -16.91% 
Complexity 25418 25418 =============================================
Files 1609 1609 Lines 95329 95331 +2 Branches 1378 1378 =============================================
- Hits 49506 33389 -16117 - Misses 45823 61942 +16119
Impacted FilesCoverage ΔComplexity Δ
...private/Collaboration/Collaborators/MailPlugin.php0% <0%> (-73.2%)27 <0> (ø)
apps/systemtags/lib/Settings/Admin.php0% <0%> (-100%)3% <0%> (ø)
...lib/Middleware/Exceptions/NotSubAdminException.php0% <0%> (-100%)1% <0%> (ø)
lib/private/BackgroundJob/QueuedJob.php0% <0%> (-100%)1% <0%> (ø)
...mments/tests/Unit/Controller/NotificationsTest.php0% <0%> (-100%)4% <0%> (ø)
...ty/Exceptions/CrossSiteRequestForgeryException.php0% <0%> (-100%)1% <0%> (ø)
...te/Authentication/Token/DefaultTokenCleanupJob.php0% <0%> (-100%)1% <0%> (ø)
...te/Authentication/LoginCredentials/Credentials.php0% <0%> (-100%)4% <0%> (ø)
lib/private/Hooks/LegacyEmitter.php0% <0%> (-100%)1% <0%> (ø)
apps/dav/lib/CalDAV/Activity/Filter/Calendar.php0% <0%> (-100%)7% <0%> (ø)
... and 529 more

@nickvergessen

nickvergessen commented Mar 2, 2018

Copy link
Copy Markdown
MemberAuthor

Fixed

@blizzz

blizzz commented Mar 2, 2018

Copy link
Copy Markdown
Member

test case for it possible?

@MorrisJobke
MorrisJobke merged commit 65cc155 into masterMar 6, 2018
@MorrisJobke
MorrisJobke deleted the bugfix/8454/sharee-email-matches-not-limited branch March 6, 2018 21:21
@MorrisJobke

MorrisJobke commented Mar 6, 2018

Copy link
Copy Markdown
Member

test case for it possible?

Still pending and should be done together with the Backport.

@nickvergessennickvergessen mentioned this pull request Mar 7, 2018
Merged
@nickvergessen

nickvergessen commented Mar 7, 2018

Copy link
Copy Markdown
MemberAuthor

Tests in #8710

@MorrisJobkeMorrisJobke mentioned this pull request Mar 9, 2018
Merged
10 tasks
@nickvergessennickvergessen mentioned this pull request Mar 9, 2018
Merged
@nickvergessen

nickvergessen commented Mar 9, 2018

Copy link
Copy Markdown
MemberAuthor

Backport in #8749

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzerrullzerrullzer approved these changes
@juliusknorrjuliusknorrjuliusknorr approved these changes
@blizzzblizzzAwaiting requested review from blizzz

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsbug

Projects

None yet

Milestone

Nextcloud 14

Development

Successfully merging this pull request may close these issues.

5 participants

@nickvergessen@rullzer@blizzz@MorrisJobke@juliusknorr