Skip to content

Commit

Permalink
Fix repeaters are registered without a populated item
Browse files Browse the repository at this point in the history
  • Loading branch information
Tofandel authored and ifox committed Oct 14, 2024
1 parent 669bed0 commit 31dc84d
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions src/Http/Controllers/Admin/ModuleController.php
Original file line number Diff line number Diff line change
Expand Up @@ -1200,6 +1200,7 @@ public function edit(TwillModelContract|int $id): mixed
$this->setBackLink();

$controllerForm = $this->getForm($item);
$controllerForm->registerDynamicRepeaters();

if ($controllerForm->hasForm()) {
$view = 'twill::layouts.form';
Expand All @@ -1221,8 +1222,11 @@ public function edit(TwillModelContract|int $id): mixed
}
}

return View::make($view, $this->form($id))->with(
['formBuilder' => $controllerForm->toFrontend($this->getSideFieldsets($item))]
$sideFieldsets = $this->getSideFieldsets($item);
$sideFieldsets->registerDynamicRepeaters();

return View::make($view, $this->form($id, $item))->with(
['formBuilder' => $controllerForm->toFrontend($sideFieldsets)]
);
}

Expand Down Expand Up @@ -1255,8 +1259,6 @@ public function create(int $parentModuleId = null): JsonResponse|RedirectRespons
return View::exists($view);
});

View::share('form', $this->form(null));

return View::make($view, $this->form(null))->with(
['formBuilder' => $controllerForm->toFrontend($this->getSideFieldsets($emptyModelInstance), true)]
);
Expand Down Expand Up @@ -1381,7 +1383,7 @@ public function preview(int $id): IlluminateView

/**
* @param int $id
* @return \Illuminate\View\View
* @return \Illuminate\Contracts\View\View
*/
public function restoreRevision($id)
{
Expand Down Expand Up @@ -1417,8 +1419,6 @@ public function restoreRevision($id)
);
}

View::share('form', $this->form($id, $item));

return View::make($view, $this->form($id, $item))->with(
['formBuilder' => $controllerForm->toFrontend($this->getSideFieldsets($item))]
);
Expand Down

0 comments on commit 31dc84d

Please sign in to comment.