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

Respect sharing options when searching for Sharees #7567

Merged
merged 1 commit into from Dec 20, 2017

Conversation

Projects
None yet
4 participants
@LEDfan
Member

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.

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

Signed-off-by: Tobia De Koninck <tobia@ledfan.be>

@LEDfan LEDfan added the 3. to review label Dec 19, 2017

@codecov

This comment has been minimized.

codecov bot commented Dec 19, 2017

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

@rullzer rullzer requested review from MorrisJobke and blizzz Dec 19, 2017

@blizzz blizzz requested a review from schiessle Dec 19, 2017

@blizzz

blizzz approved these changes Dec 19, 2017

works

@MorrisJobke

Tested and works 👍

@MorrisJobke MorrisJobke merged commit 9ed0f50 into stable12 Dec 20, 2017

2 of 4 checks passed

codecov/patch 11.11% of diff hit (target 53.93%)
Details
codecov/project 53.93% (-0.01%) compared to 6859e5a
Details
continuous-integration/drone/pr the build was successful
Details
continuous-integration/drone/push the build was successful
Details

@MorrisJobke MorrisJobke deleted the stable-12_fix7428 branch Dec 20, 2017

@MorrisJobke MorrisJobke referenced this pull request Jan 8, 2018

Merged

12.0.5 RC1 #7740

13 of 13 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment