Skip to content

groupname like username - allow share with both #14766

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

Merged
MorrisJobke merged 3 commits into from
Mar 20, 2019
Merged

groupname like username - allow share with both #14766

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03ee137
groupname like username - allow share with both
aignerat Mar 15, 2019
bb367f8
Update lib/private/Share20/Manager.php
MorrisJobke Mar 20, 2019
ab7858d
Update lib/private/Share20/Manager.php
MorrisJobke Mar 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/private/Share20/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ protected function userCreateChecks(\OCP\Share\IShare $share) {
}

// Identical share already existst
if ($existingShare->getSharedWith() === $share->getSharedWith()) {
if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
throw new \Exception('Path is already shared with this user');
}

Expand Down Expand Up @@ -493,7 +493,7 @@ protected function groupCreateChecks(\OCP\Share\IShare $share) {
//It is a new share so just continue
}

if ($existingShare->getSharedWith() === $share->getSharedWith()) {
if ($existingShare->getSharedWith() === $share->getSharedWith() && $existingShare->getShareType() === $share->getShareType()) {
throw new \Exception('Path is already shared with this group');
}
}
Expand Down