Merge pull request #178 from cnizzardini/bug/bake-theme

Bug/bake theme
cnizzardini · Aug 22, 2020 · 77767ee · 77767ee
2 parents b7c7642 + 7ec2f13
commit 77767ee
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/src/Lib/Annotation/AbstractParameter.php b/src/Lib/Annotation/AbstractParameter.php
@@ -112,7 +112,7 @@ public function __construct(array $values)
             throw new InvalidArgumentException('`name` or `ref` parameter is required');
         }
 
-        $name = $values['name'];
+        $name = $values['name'] ?? $values['ref'];
 
         if (isset($values['type']) && !in_array($values['type'], OpenApiDataType::TYPES)) {
             $type = $values['type'];

diff --git a/templates/bake/element/Controller/add.twig b/templates/bake/element/Controller/add.twig
@@ -27,6 +27,7 @@
         ${{ singularName }} = $this->{{ currentModelName }}->newEmptyEntity();
         ${{ singularName }} = $this->{{ currentModelName }}->patchEntity(${{ singularName }}, $this->request->getData());
         if ($this->{{ currentModelName }}->save(${{ singularName }})) {
+            $this->set('{{ singularName }}', ${{ singularName }});
             $this->viewBuilder()->setOption('serialize', {{ compact|join(', ')|raw }});
             return;
         }

diff --git a/templates/bake/element/Controller/edit.twig b/templates/bake/element/Controller/edit.twig
@@ -33,6 +33,7 @@
         ]);
         ${{ singularName }} = $this->{{ currentModelName }}->patchEntity(${{ singularName }}, $this->request->getData());
         if ($this->{{ currentModelName }}->save(${{ singularName }})) {
+            $this->set('{{ singularName }}', ${{ singularName }});
             $this->viewBuilder()->setOption('serialize', {{ compact|join(', ')|raw }});
             return;
         }

diff --git a/tests/assets/BakersController.php b/tests/assets/BakersController.php
@@ -61,6 +61,7 @@ public function add()
         $baker = $this->Bakers->newEmptyEntity();
         $baker = $this->Bakers->patchEntity($baker, $this->request->getData());
         if ($this->Bakers->save($baker)) {
+            $this->set('baker', $baker);
             $this->viewBuilder()->setOption('serialize', 'baker');
             return;
         }
@@ -84,6 +85,7 @@ public function edit($id = null)
         ]);
         $baker = $this->Bakers->patchEntity($baker, $this->request->getData());
         if ($this->Bakers->save($baker)) {
+            $this->set('baker', $baker);
             $this->viewBuilder()->setOption('serialize', 'baker');
             return;
         }