mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-06-07 18:44:08 +00:00
Fixed: [budget] Fix voter on household's budget
This commit is contained in:
parent
cd54fdd13f
commit
d35dacf562
@ -11,8 +11,8 @@ declare(strict_types=1);
|
||||
|
||||
namespace Chill\BudgetBundle\Entity;
|
||||
|
||||
use Chill\MainBundle\Entity\Center;
|
||||
use Chill\MainBundle\Entity\HasCenterInterface;
|
||||
use Chill\MainBundle\Entity\HasCentersInterface;
|
||||
use Chill\PersonBundle\Entity\Person;
|
||||
use DateTimeImmutable;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
@ -22,7 +22,7 @@ use Doctrine\ORM\Mapping as ORM;
|
||||
* @ORM\Table(name="chill_budget.charge")
|
||||
* @ORM\Entity(repositoryClass="Chill\BudgetBundle\Repository\ChargeRepository")
|
||||
*/
|
||||
class Charge extends AbstractElement implements HasCenterInterface
|
||||
class Charge extends AbstractElement implements HasCentersInterface
|
||||
{
|
||||
public const HELP_ASKED = 'running';
|
||||
|
||||
@ -46,22 +46,24 @@ class Charge extends AbstractElement implements HasCenterInterface
|
||||
private $help = self::HELP_NOT_RELEVANT;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
*
|
||||
* @ORM\Column(name="id", type="integer")
|
||||
* @ORM\Id
|
||||
* @ORM\GeneratedValue(strategy="AUTO")
|
||||
*/
|
||||
private $id;
|
||||
private ?int $id = null;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->setStartDate(new DateTimeImmutable('today'));
|
||||
}
|
||||
|
||||
public function getCenter(): ?Center
|
||||
public function getCenters(): array
|
||||
{
|
||||
return $this->getPerson()->getCenter();
|
||||
if (null !== $this->getPerson()) {
|
||||
return [$this->getPerson()->getCenter()];
|
||||
}
|
||||
|
||||
return $this->getHousehold()->getCurrentPersons()->map(static fn (Person $p) => $p->getCenter())->toArray();
|
||||
}
|
||||
|
||||
public function getHelp()
|
||||
|
@ -11,8 +11,8 @@ declare(strict_types=1);
|
||||
|
||||
namespace Chill\BudgetBundle\Entity;
|
||||
|
||||
use Chill\MainBundle\Entity\Center;
|
||||
use Chill\MainBundle\Entity\HasCenterInterface;
|
||||
use Chill\MainBundle\Entity\HasCentersInterface;
|
||||
use Chill\PersonBundle\Entity\Person;
|
||||
use DateTimeImmutable;
|
||||
use Doctrine\ORM\Mapping as ORM;
|
||||
|
||||
@ -22,25 +22,27 @@ use Doctrine\ORM\Mapping as ORM;
|
||||
* @ORM\Table(name="chill_budget.resource")
|
||||
* @ORM\Entity(repositoryClass="Chill\BudgetBundle\Repository\ResourceRepository")
|
||||
*/
|
||||
class Resource extends AbstractElement implements HasCenterInterface
|
||||
class Resource extends AbstractElement implements HasCentersInterface
|
||||
{
|
||||
/**
|
||||
* @var int
|
||||
*
|
||||
* @ORM\Column(name="id", type="integer")
|
||||
* @ORM\Id
|
||||
* @ORM\GeneratedValue(strategy="AUTO")
|
||||
*/
|
||||
private $id;
|
||||
private ?int $id = null;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this->setStartDate(new DateTimeImmutable('today'));
|
||||
}
|
||||
|
||||
public function getCenter(): ?Center
|
||||
public function getCenters(): array
|
||||
{
|
||||
return $this->getPerson()->getCenter();
|
||||
if (null !== $this->getPerson()) {
|
||||
return [$this->getPerson()->getCenter()];
|
||||
}
|
||||
|
||||
return $this->getHousehold()->getCurrentPersons()->map(static fn (Person $p) => $p->getCenter())->toArray();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -20,7 +20,7 @@ use Chill\PersonBundle\Entity\Household\Household;
|
||||
use Chill\PersonBundle\Entity\Person;
|
||||
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
|
||||
|
||||
use function in_array;
|
||||
use UnexpectedValueException;
|
||||
|
||||
class BudgetElementVoter extends AbstractChillVoter implements ProvideRoleHierarchyInterface
|
||||
{
|
||||
@ -68,12 +68,29 @@ class BudgetElementVoter extends AbstractChillVoter implements ProvideRoleHierar
|
||||
|
||||
protected function supports($attribute, $subject)
|
||||
{
|
||||
return (in_array($attribute, self::ROLES, true) && $subject instanceof AbstractElement)
|
||||
|| (($subject instanceof Person || $subject instanceof Household) && in_array($attribute, [self::SEE, self::CREATE], true));
|
||||
return $this->voter->supports($attribute, $subject);
|
||||
}
|
||||
|
||||
protected function voteOnAttribute($attribute, $subject, TokenInterface $token)
|
||||
{
|
||||
return $this->voter->voteOnAttribute($attribute, $subject, $token);
|
||||
if (
|
||||
$subject instanceof Person
|
||||
|| ($subject instanceof AbstractElement && null !== $person = $subject->getPerson())) {
|
||||
return $this->voter->voteOnAttribute($attribute, $person ?? $subject, $token);
|
||||
}
|
||||
|
||||
if (
|
||||
$subject instanceof Household
|
||||
|| ($subject instanceof AbstractElement && null !== $household = $subject->getHousehold())) {
|
||||
foreach (($household ?? $subject)->getCurrentPersons() as $person) {
|
||||
if ($this->voter->voteOnAttribute($attribute, $person, $token)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
throw new UnexpectedValueException('This subject is not supported, or is an element not associated with person or household');
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user