Merge pull request #14 from NicolasBarbey/main

page type is not mandatory
thelia-modules · Nov 20, 2023 · 2397f77 · 2397f77
2 parents 5d3341d + d2b5f73
commit 2397f77
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/Config/module.xml b/Config/module.xml
@@ -20,7 +20,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>1.1.7</version>
+    <version>1.1.8</version>
     <authors>
         <author>
             <name>Damien Foulhoux</name>

diff --git a/Controller/Admin/PageController.php b/Controller/Admin/PageController.php
@@ -68,7 +68,7 @@ public function createPageAction(Session $session, PageProvider $pageProvider, P
             $pageProvider->createPage(
                 $formData['title'],
                 $formData['code'],
-                $formData['type'],
+                $formData['type'] ?: null,
                 $formData['thelia-block'],
                 $formData['description'],
                 $locale,
@@ -155,7 +155,7 @@ function(Page $page) use ($locale) {
             'current_tab' => $request->get('current_tab')
         ]);
     }
-    
+
     /**
      * @Route("/update/{pageId}", name="_update_page_action", methods="POST")
      */
@@ -178,7 +178,7 @@ public function updatePageAction(Request $request, Session $session, PageProvide
                 $formData['title'],
                 $formData['code'],
                 $formData['tag'],
-                $formData['type'],
+                $formData['type'] ?: null,
                 $formData['description'],
                 $formData['chapo'],
                 $formData['postscriptum'],

diff --git a/Form/EditPageForm.php b/Form/EditPageForm.php
@@ -65,7 +65,6 @@ protected function buildForm()
                 'type',
                 ChoiceType::class,
                 [
-                    "empty_data" => $this->translator->trans('Choose a block', [], 'page.bo.default'),
                     "choices" => $this->getPageTypes(),
                     'required' => false,
                     'label' => $this->translator->trans('Page type', [], 'page.bo.default'),

diff --git a/Form/PageForm.php b/Form/PageForm.php
@@ -55,7 +55,6 @@ protected function buildForm()
                 'type',
                 ChoiceType::class,
                 [
-                    "empty_data" => $this->translator->trans('Choose a page type', [], 'page.bo.default'),
                     "choices" => $this->getPageTypes(),
                     'required' => false,
                     'label' => $this->translator->trans('Page type', [], 'page.bo.default'),
@@ -84,7 +83,7 @@ protected function getPageTypes(): array
     {
         $choices = [];
         $types = PageTypeQuery::create()->find();
-
+        $choices['No type'] = '';
         /** @var PageType $type */
         foreach ($types as $type) {
             $choices[$type->getType()] = $type->getId();

diff --git a/Service/PageProvider.php b/Service/PageProvider.php
@@ -97,7 +97,7 @@ public function updatePage(
         string $title,
         string $code = null,
         ?string $tag = null,
-        int    $typeId = null,
+        ?int    $typeId = null,
         string $description = null,
         string $chapo = null,
         string $postscriptum = null,