Merge pull request #635 from jockri/override-pagepartwidget-template

[PagePartBundle] Make it possible to override the twig template for a custom PagePartWidget
Kunstmaan · Aug 18, 2015 · 728f09e · 728f09e
2 parents e40b4e4 + d5ef39e
commit 728f09e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidget.php b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidget.php
@@ -48,7 +48,7 @@ public function __construct(array $types = array(), array $data = array())
         $this->types = $types;
         $this->data = $data;
 
-        $this->template = 'KunstmaanAdminBundle:FormWidgets\FormWidget:widget.html.twig';
+        $this->setTemplate('KunstmaanAdminBundle:FormWidgets\FormWidget:widget.html.twig');
     }
 
     /**

diff --git a/src/Kunstmaan/PagePartBundle/Helper/FormWidgets/PagePartWidget.php b/src/Kunstmaan/PagePartBundle/Helper/FormWidgets/PagePartWidget.php
@@ -3,7 +3,6 @@
 namespace Kunstmaan\PagePartBundle\Helper\FormWidgets;
 
 use Doctrine\ORM\EntityManager;
-
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -15,12 +14,8 @@
 use Kunstmaan\PagePartBundle\PagePartAdmin\AbstractPagePartAdminConfigurator;
 use Kunstmaan\PagePartBundle\Helper\HasPagePartsInterface;
 
-/**
- * PagePartWidget
- */
 class PagePartWidget extends FormWidget
 {
-
     /**
      * @var AbstractPagePartAdminConfigurator
      */
@@ -57,7 +52,7 @@ class PagePartWidget extends FormWidget
     protected $request;
 
     /**
-     * @param HasNodeInterface                  $page                      The page
+     * @param HasPagePartsInterface             $page                      The page
      * @param Request                           $request                   The request
      * @param EntityManager                     $em                        The entity manager
      * @param AbstractPagePartAdminConfigurator $pagePartAdminConfigurator The page part admin configurator
@@ -76,6 +71,7 @@ public function __construct(HasPagePartsInterface $page, Request $request, Entit
         $this->request = $request;
 
         $this->pagePartAdmin = $pagePartAdminFactory->createList($pagePartAdminConfigurator, $em, $page, null);
+        $this->setTemplate('KunstmaanPagePartBundle:FormWidgets\PagePartWidget:widget.html.twig');
     }
 
     /**
@@ -127,14 +123,6 @@ public function getFormErrors(FormView $formView)
         return $errors;
     }
 
-    /**
-     * @return string
-     */
-    public function getTemplate()
-    {
-        return 'KunstmaanPagePartBundle:FormWidgets\PagePartWidget:widget.html.twig';
-    }
-
     /**
      * @return PagePartAdmin
      */
@@ -158,5 +146,4 @@ public function getExtraParams(Request $request)
 
         return $params;
     }
-
 }