diff --git a/.changes/unreleased/Fixed-20240130-140301.yaml b/.changes/unreleased/Fixed-20240130-140301.yaml new file mode 100644 index 000000000..45fb94f6a --- /dev/null +++ b/.changes/unreleased/Fixed-20240130-140301.yaml @@ -0,0 +1,6 @@ +kind: Fixed +body: Fix the conditions upon which social actions should be optional or required + in relation to social issues within the activity creation form +time: 2024-01-30T14:03:01.942955636+01:00 +custom: + Issue: "256" diff --git a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php index c14c8292b..96c369b39 100644 --- a/src/Bundle/ChillActivityBundle/Entity/ActivityType.php +++ b/src/Bundle/ChillActivityBundle/Entity/ActivityType.php @@ -291,7 +291,11 @@ class ActivityType public function checkSocialActionsVisibility(ExecutionContextInterface $context, mixed $payload) { if ($this->socialIssuesVisible !== $this->socialActionsVisible) { - if (!(2 === $this->socialIssuesVisible && 1 === $this->socialActionsVisible)) { + // if social issues are invisible then social actions cannot be optional or required + if social issues are optional then social actions shouldn't be required + if ( + (0 === $this->socialIssuesVisible && (1 === $this->socialActionsVisible || 2 === $this->socialActionsVisible)) + || (1 === $this->socialIssuesVisible && 2 === $this->socialActionsVisible) + ) { $context ->buildViolation('The socialActionsVisible value is not compatible with the socialIssuesVisible value') ->atPath('socialActionsVisible')