Skip to content

IBX-12283: Can't delete own draft with policy version remove with limitation owner #813

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

Open
papcio122 wants to merge 1 commit into
base: 4.6
Choose a base branch
from
Open

IBX-12283: Can't delete own draft with policy version remove with limitation owner #813

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion src/lib/Limitation/OwnerLimitationType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,12 @@ public function evaluate(APILimitationValue $value, APIUserReference $currentUse
);
}

$versionCreatorId = null;
if ($object instanceof Content) {
$versionCreatorId = $object->getVersionInfo()->creatorId;
$object = $object->getVersionInfo()->getContentInfo();
} elseif ($object instanceof VersionInfo) {
$versionCreatorId = $object->creatorId;
$object = $object->getContentInfo();
} elseif (!$object instanceof ContentInfo && !$object instanceof ContentCreateStruct) {
throw new InvalidArgumentException(
Expand All @@ -141,9 +144,10 @@ public function evaluate(APILimitationValue $value, APIUserReference $currentUse
* @var $object ContentInfo
*/
$isOwner = $object->ownerId === $userId;
$isVersionCreator = $versionCreatorId !== null && $versionCreatorId === $userId;
$isSelf = $object instanceof ContentInfo && $object->id === $userId;

return $isOwner || $isSelf;
return $isOwner || $isVersionCreator || $isSelf;
}

/**
Expand Down
Loading