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.

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

Respect sharing options when searching for Sharees #7567

Merged
merged 1 commit into from
Dec 20, 2017
Merged

Respect sharing options when searching for Sharees #7567

merged 1 commit into from
Dec 20, 2017

Conversation

LEDfan
Copy link
Member

@LEDfan LEDfan commented Dec 19, 2017

Backport of #7490

I didn't backported the tests because some results are returned in the method and some are set using sharees->result.

@LEDfan
Don't show users which e-mail address match if they belong to a group…
7f18a8d 
… we may not share with

Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
@LEDfan LEDfan added the 3. to review Waiting for reviews label Dec 19, 2017
@codecov
Copy link

codecov bot commented Dec 19, 2017 •
edited
Loading

Codecov Report

Merging #7567 into stable12 will decrease coverage by <.01%.
The diff coverage is 11.11%.

@@              Coverage Diff               @@
##             stable12    #7567      +/-   ##
==============================================
- Coverage       53.93%   53.93%   -0.01%     
- Complexity      22708    22712       +4     
==============================================
  Files            1385     1385              
  Lines           86986    86995       +9     
  Branches         1330     1330              
==============================================
+ Hits            46916    46918       +2     
- Misses          40070    40077       +7
Impacted Files Coverage Δ Complexity Δ
...es_sharing/lib/Controller/ShareesAPIController.php 63.23% <11.11%> (-1.24%) 118 <0> (+4)
apps/files_trashbin/lib/Trashbin.php 72.28% <0%> (-0.25%) 136% <0%> (ø)
lib/private/Server.php 84.8% <0%> (+0.12%) 121% <0%> (ø) ⬇️
apps/files_trashbin/lib/Expiration.php 91.93% <0%> (+1.61%) 29% <0%> (ø) ⬇️

@rullzer rullzer added this to the Nextcloud 12.0.5 milestone Dec 19, 2017
@blizzz blizzz requested a review from schiessle December 19, 2017 16:22
blizzz
blizzz approved these changes Dec 19, 2017
View reviewed changes
Copy link
Member

@blizzz blizzz left a comment

Choose a reason for hiding this comment

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

works

MorrisJobke
MorrisJobke approved these changes Dec 20, 2017
View reviewed changes
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.

Tested and works 👍

@MorrisJobke MorrisJobke merged commit 9ed0f50 into stable12 Dec 20, 2017
@MorrisJobke MorrisJobke deleted the stable-12_fix7428 branch December 20, 2017 13:18
@MorrisJobke MorrisJobke mentioned this pull request Jan 8, 2018
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MorrisJobke MorrisJobke MorrisJobke approved these changes

@blizzz blizzz blizzz approved these changes

@schiessle schiessle Awaiting requested review from schiessle

Assignees
No one assigned
Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
Nextcloud 12.0.5
Development

Successfully merging this pull request may close these issues.
4 participants
@LEDfan @MorrisJobke @blizzz @rullzer