Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-02 04:53:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

Testing to see what still works, minor changes

Browse Source
This commit is contained in:
Julie Lenaerts
2022-02-23 14:53:37 +01:00
parent 5a514cf2db
commit 67ae506bb5
7 changed files with 53 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
View File

@@ -20,26 +20,18 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Contracts\Translation\TranslatorInterface;
use function get_class;
abstract class AbstractElementController extends Controller
{
/**
* @var LoggerInterface
*/
protected $chillMainLogger;
protected LoggerInterface $chillMainLogger;
/**
* @var EntityManagerInterface
*/
protected $em;
protected EntityManagerInterface $em;
/**
* @var TranslatorInterface
*/
protected $translator;
protected TranslatorInterface $translator;
public function __construct(
EntityManagerInterface $em,
@@ -59,13 +51,11 @@ abstract class AbstractElementController extends Controller
*
* @param mixed $template
* @param mixed $flashMessage
*
* @return \Symfony\Component\BrowserKit\Response
*/
protected function _delete(AbstractElement $element, Request $request, $template, $flashMessage)
protected function _delete(AbstractElement $element, Request $request, $template, $flashMessage): Response
{
$this->denyAccessUnlessGranted(BudgetElementVoter::DELETE, $element, 'You are not '
. 'allowed to delete this family membership');
// $this->denyAccessUnlessGranted(BudgetElementVoter::DELETE, $element, 'You are not '
// . 'allowed to delete this family membership');
$form = $this->createDeleteForm();
@@ -103,12 +93,10 @@ abstract class AbstractElementController extends Controller
/**
* @param string $template
* @param string $flashOnSuccess
*
* @return \Symfony\Component\HttpFoundation\Response
*/
protected function _edit(AbstractElement $element, Request $request, $template, $flashOnSuccess)
protected function _edit(AbstractElement $element, Request $request, $template, $flashOnSuccess): Response
{
$this->denyAccessUnlessGranted(BudgetElementVoter::UPDATE, $element);
// $this->denyAccessUnlessGranted(BudgetElementVoter::UPDATE, $element);
$form = $this->createForm($this->getType(), $element);
$form->add('submit', SubmitType::class);
@@ -139,11 +127,11 @@ abstract class AbstractElementController extends Controller
*/
protected function _new(Person $person, Request $request, $template, $flashMessageOnSuccess)
{
/** @var \Chill\BudgetBundle\Entity\AbstractElement $element */
/** @var AbstractElement $element */
$element = $this->createNewElement()
->setPerson($person);
$this->denyAccessUnlessGranted(BudgetElementVoter::CREATE, $element);
// $this->denyAccessUnlessGranted(BudgetElementVoter::CREATE, $element);
$form = $this->createForm($this->getType(), $element);
$form->add('submit', SubmitType::class);
@@ -183,7 +171,7 @@ abstract class AbstractElementController extends Controller
*/
protected function _view(AbstractElement $element, $template)
{
$this->denyAccessUnlessGranted(BudgetElementVoter::SHOW, $element);
// $this->denyAccessUnlessGranted(BudgetElementVoter::SHOW, $element);
return $this->render($template, [
'element' => $element,

2
src/Bundle/ChillBudgetBundle/Controller/ElementController.php
View File

@@ -68,7 +68,7 @@ class ElementController extends Controller
*/
public function indexAction(Person $person)
{
$this->denyAccessUnlessGranted(BudgetElementVoter::SHOW, $person);
// $this->denyAccessUnlessGranted(BudgetElementVoter::SHOW, $person);
$charges = $this->em
->getRepository(Charge::class)

15
src/Bundle/ChillBudgetBundle/Controller/ResourceController.php
View File

@@ -16,6 +16,7 @@ use Chill\BudgetBundle\Form\ResourceType;
use Chill\PersonBundle\Entity\Person;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
class ResourceController extends AbstractElementController
{
@@ -24,8 +25,6 @@ class ResourceController extends AbstractElementController
* "{_locale}/budget/resource/{id}/delete",
* name="chill_budget_resource_delete"
* )
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function deleteAction(Request $request, Resource $resource)
{
@@ -42,10 +41,8 @@ class ResourceController extends AbstractElementController
* "{_locale}/budget/resource/{id}/edit",
* name="chill_budget_resource_edit"
* )
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function editAction(Request $request, Resource $resource)
public function editAction(Request $request, Resource $resource): Response
{
return $this->_edit(
$resource,
@@ -60,10 +57,8 @@ class ResourceController extends AbstractElementController
* "{_locale}/budget/resource/by-person/{id}/new",
* name="chill_budget_resource_new"
* )
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function newAction(Request $request, Person $person)
public function newAction(Request $request, Person $person): Response
{
return $this->_new(
$person,
@@ -78,10 +73,8 @@ class ResourceController extends AbstractElementController
* "{_locale}/budget/resource/{id}/view",
* name="chill_budget_resource_view"
* )
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function viewAction(Resource $resource)
public function viewAction(Resource $resource): Response
{
return $this->_view($resource, '@ChillBudget/Resource/view.html.twig');
}