fix select generator and table query

tomatophp · Dec 11, 2023 · 2231f74 · 2231f74
1 parent 125952e
commit 2231f74
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Services/Generator/Concerns/GenerateForm.php b/src/Services/Generator/Concerns/GenerateForm.php
@@ -92,7 +92,7 @@ private function generateForm(bool $view=false): string
                 }
                 else {
                     $itemLable=($item['relation']['relationColumnType'] == 'json')?'name.'.app()->getLocale():'name';
-                    $form .= "<x-splade-select :label=\"__('".Str::ucfirst(str_replace('_', ' ', $item['name']))."')\" :placeholder=\"__('".Str::ucfirst(str_replace('_', ' ', $item['name']))."')\" name=\"".$item['name']."\" remote-url=\"/admin/".$item['relation']['table']."/api\" remote-root=\"model.data\" option-label=$itemLable option-value=\"id\" choices/>";
+                    $form .= "<x-splade-select :label=\"__('".Str::ucfirst(str_replace('_', ' ', $item['name']))."')\" :placeholder=\"__('".Str::ucfirst(str_replace('_', ' ', $item['name']))."')\" name=\"".$item['name']."\" remote-url=\"/admin/".$item['relation']['table']."/api\" remote-root=\"data\" option-label=\"$itemLable\" option-value=\"id\" choices/>";
                 }
             }
             if($item['type'] === 'date'){

diff --git a/stubs/table.stub b/stubs/table.stub
@@ -15,7 +15,7 @@ class {{ name }} extends AbstractTable
      *
      * @return void
      */
-    public function __construct(public Builder|null $query=null)
+    public function __construct(public mixed $query=null)
     {
         if(!$query){
             $this->query = {{ model }}::query();

diff --git a/stubs/view.stub b/stubs/view.stub
@@ -1,4 +1,4 @@
-<x-tomato-admin-container label="{{trans('tomato-admin::global.crud.view')}} {{__('{{ table }}')}} #{{$model->id}}">
+<x-tomato-admin-container label="{{trans('tomato-admin::global.crud.view')}} {{__('{{ title }}')}} #{{$model->id}}">
     <div class="grid grid-cols-1 lg:grid-cols-2 gap-4">
         {{ cols }}
     </div>