Activity: fixes in voter

* the role CREATE is now transformed to CREATE_ACCOMPANYING_COURSE or
CREATE_PERSON when the subject is, respectively, a course or a person;
* the button at the list of activities is now labeled "create"
* the role FULL give access to both role
acTIVITY_CREATE_ACCOMPANYING_COURSE and ACTIVITY_CREATE_PERSON, but not
ACTIVITY_CREATE directly.
This commit is contained in:
2021-11-23 09:05:56 +01:00
parent f9b33fdfb8
commit 05dda33a7a
3 changed files with 18 additions and 6 deletions

View File

@@ -134,14 +134,22 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
} else {
throw new \RuntimeException("could not determine context of activity");
}
}
if ($subject instanceof AccompanyingPeriod) {
} elseif ($subject instanceof AccompanyingPeriod) {
if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
if (\in_array($attribute, [self::UPDATE, self::CREATE, self::DELETE])) {
return false;
}
}
// transform the attribute
if (self::CREATE === $attribute) {
$attribute = self::CREATE_ACCOMPANYING_COURSE;
}
} elseif ($subject instanceof Person) {
// transform the attribute
if (self::CREATE === $attribute) {
$attribute = self::CREATE_PERSON;
}
}
return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);