Using the right form name that is passed into Mautic.launchBuilder() …

…method. Plus removing unused dependency and some CS improvements
dhilst · Apr 15, 2020 · bf569a1 · bf569a1
1 parent 9828415
commit bf569a1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 36 deletions.
diff --git a/app/bundles/EmailBundle/Config/config.php b/app/bundles/EmailBundle/Config/config.php
@@ -298,7 +298,6 @@
                 'arguments' => [
                     'translator',
                     'doctrine.orm.entity_manager',
-                    'request_stack',
                     'mautic.stage.model.stage',
                 ],
             ],

diff --git a/app/bundles/EmailBundle/Form/Type/EmailType.php b/app/bundles/EmailBundle/Form/Type/EmailType.php
@@ -40,7 +40,6 @@
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Translation\TranslatorInterface;
 
@@ -58,11 +57,6 @@ class EmailType extends AbstractType
      */
     private $em;
 
-    /**
-     * @var RequestStack
-     */
-    private $requestStack;
-
     /**
      * @var StageModel
      */
@@ -71,13 +65,11 @@ class EmailType extends AbstractType
     public function __construct(
         TranslatorInterface $translator,
         EntityManager $entityManager,
-        RequestStack $requestStack,
         StageModel $stageModel
     ) {
-        $this->translator   = $translator;
-        $this->em           = $entityManager;
-        $this->requestStack = $requestStack;
-        $this->stageModel   = $stageModel;
+        $this->translator = $translator;
+        $this->em         = $entityManager;
+        $this->stageModel = $stageModel;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -383,7 +375,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ]
         );
 
-        $request                 = $this->requestStack->getCurrentRequest();
         $variantSettingsModifier = function (FormEvent $event, $isVariant) {
             if ($isVariant) {
                 $event->getForm()->add(
@@ -427,7 +418,6 @@ function (FormEvent $event) use ($variantSettingsModifier) {
             }
         );
 
-        //add category
         $builder->add(
             'category',
             CategoryListType::class,
@@ -436,7 +426,6 @@ function (FormEvent $event) use ($variantSettingsModifier) {
             ]
         );
 
-        //add lead lists
         $transformer = new IdToEntityModelTransformer($this->em, 'MauticLeadBundle:LeadList', 'id', true);
         $builder->add(
             $builder->create(
@@ -470,7 +459,6 @@ function (FormEvent $event) use ($variantSettingsModifier) {
             ]
         );
 
-        //add lead lists
         $transformer = new IdToEntityModelTransformer(
             $this->em,
             'MauticAssetBundle:Asset',
@@ -497,24 +485,21 @@ function (FormEvent $event) use ($variantSettingsModifier) {
 
         $builder->add('sessionId', HiddenType::class);
         $builder->add('emailType', HiddenType::class);
-
-        $customButtons = [
-            [
-                'name'  => 'builder',
-                'label' => 'mautic.core.builder',
-                'attr'  => [
-                    'class'   => 'btn btn-default btn-dnd btn-nospin text-primary btn-builder',
-                    'icon'    => 'fa fa-cube',
-                    'onclick' => "Mautic.launchBuilder('email', 'email');",
-                ],
-            ],
-        ];
-
         $builder->add(
             'buttons',
             FormButtonsType::class,
             [
-                'pre_extra_buttons' => $customButtons,
+                'pre_extra_buttons' => [
+                    [
+                        'name'  => 'builder',
+                        'label' => 'mautic.core.builder',
+                        'attr'  => [
+                            'class'   => 'btn btn-default btn-dnd btn-nospin text-primary btn-builder',
+                            'icon'    => 'fa fa-cube',
+                            'onclick' => "Mautic.launchBuilder('{$this->getBlockPrefix()}', 'email');",
+                        ],
+                    ],
+                ],
             ]
         );
 
@@ -547,9 +532,6 @@ public function configureOptions(OptionsResolver $resolver)
         $resolver->setDefined(['update_select']);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $stages       = $this->stageModel->getRepository()->getSimpleList();
@@ -566,9 +548,6 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         $view->vars['stages']    = $stageChoices;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getBlockPrefix()
     {
         return 'emailform';