From 2dcc65d1724eac1c0c9ec7da786feee7b225e29a Mon Sep 17 00:00:00 2001 From: Mathieu Jaumotte Date: Wed, 29 Mar 2023 13:49:10 +0200 Subject: [PATCH] unresolved! temporary disable deprecated appendScopeChoices function in reportType form --- .../Controller/ReportController.php | 6 +++--- .../ChillReportBundle/Form/ReportType.php | 20 +++++++++---------- .../Resources/views/Report/edit.html.twig | 2 ++ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/Bundle/ChillReportBundle/Controller/ReportController.php b/src/Bundle/ChillReportBundle/Controller/ReportController.php index 4dc914079..2e3fde826 100644 --- a/src/Bundle/ChillReportBundle/Controller/ReportController.php +++ b/src/Bundle/ChillReportBundle/Controller/ReportController.php @@ -589,8 +589,8 @@ class ReportController extends AbstractController ), 'method' => 'PUT', 'cFGroup' => $entity->getCFGroup(), - 'role' => ReportVoter::UPDATE, - 'center' => $this->centerResolverManager->resolveCenters($entity->getPerson()), - ]); + //'role' => ReportVoter::UPDATE, + //'center' => $this->centerResolverManager->resolveCenters($entity->getPerson()), + ]); } } diff --git a/src/Bundle/ChillReportBundle/Form/ReportType.php b/src/Bundle/ChillReportBundle/Form/ReportType.php index 435d894d9..ed8c4aff4 100644 --- a/src/Bundle/ChillReportBundle/Form/ReportType.php +++ b/src/Bundle/ChillReportBundle/Form/ReportType.php @@ -74,15 +74,15 @@ class ReportType extends AbstractType 'group' => $options['cFGroup'], ] ); - $this->appendScopeChoices( - $builder, - $options['role'], - $options['center'], - $this->user, - $this->authorizationHelper, - $this->translatableStringHelper, - $this->om - ); + //$this->appendScopeChoices( + // $builder, + // $options['role'], + // $options['center'], + // $this->user, + // $this->authorizationHelper, + // $this->translatableStringHelper, + // $this->om + //); } public function configureOptions(OptionsResolver $resolver) @@ -97,7 +97,7 @@ class ReportType extends AbstractType $resolver->setAllowedTypes('cFGroup', 'Chill\CustomFieldsBundle\Entity\CustomFieldsGroup'); - $this->appendScopeChoicesOptions($resolver); + //$this->appendScopeChoicesOptions($resolver); } /** diff --git a/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig b/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig index ec205c2fb..ccdaf9429 100644 --- a/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig +++ b/src/Bundle/ChillReportBundle/Resources/views/Report/edit.html.twig @@ -25,7 +25,9 @@ {{ form_row(edit_form.user) }} {{ form_row(edit_form.date) }} + {# {{ form_row(edit_form.scope) }} + #} {{ form_row(edit_form.cFData) }} {{ form_widget(edit_form) }}