1.2.3

Okipa · Sep 13, 2019 · cc9953b · cc9953b
1 parent 97023d9
commit cc9953b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,24 @@
 # Changelog
 
+## [1.2.3](https://github.com/Okipa/laravel-table/releases/tag/1.2.3)
+2019-09-13
+- The model is now directly passed to the route during the table `show`, `edit` and `destroy` routes generation instead of its id.
+```php
+// assuming your declared your edit route like this :
+(new Table)->model(User::class)->routes([
+    // ...
+    'edit'    => ['name'=> 'user.edit', 'params' => ['foo' => 'bar']],
+    //...
+])
+// the route will be generated like this during the table instantiation :
+route('user.edit, [$user, 'foo' => 'bar']);
+// instead of this way
+route('user.edit, [$user->id, 'foo' => 'bar']);
+```
+
 ## [1.2.2](https://github.com/Okipa/laravel-table/releases/tag/1.2.2)
 2019-09-13
 - Fixed params order when generating the table routes. The table model id was not positioned at first when declaring other parameters.
-
 ```php
 // with a route declared like this :
 Route::get('user/edit/{user}/{foo}', 'UsersController@edit')->name('user.edit');

diff --git a/src/Table.php b/src/Table.php
@@ -10,6 +10,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
+use Okipa\LaravelTable\Test\Models\User;
 use Okipa\LaravelTable\Traits\TableClassesCustomizations;
 use Okipa\LaravelTable\Traits\TableColumnsValidationChecks;
 use Okipa\LaravelTable\Traits\TableInteractions;

diff --git a/tests/Unit/RoutesTest.php b/tests/Unit/RoutesTest.php
@@ -240,7 +240,7 @@ public function testSetRouteDefinitionWithProvidedId()
                 return null;
             },
         ]);
-        app('router')->get('/user/destroy/{id}/{foo}', [
+        app('router')->post('/user/destroy/{id}/{foo}', [
             'as' => 'user.destroy', function () {
                 return null;
             },
@@ -277,7 +277,7 @@ public function testSetImplicitBindingRoutes()
                 return null;
             },
         ]);
-        app('router')->get('/user/destroy/{user}/{foo}', [
+        app('router')->post('/user/destroy/{user}/{foo}', [
             'as' => 'user.destroy', function () {
                 return null;
             },

diff --git a/views/bootstrap/tbody.blade.php b/views/bootstrap/tbody.blade.php
@@ -77,34 +77,34 @@
                             <div class="d-flex justify-content-end">
                                 {{-- show button --}}
                                 @if($table->isRouteDefined('show'))
-                                    <form id="show-{{ $model->id }}"
+                                    <form id="show-{{ $model->getKey() }}"
                                           role="form"
                                           method="GET"
-                                          action="{{ $table->route('show', [$model->id]) }}">
+                                          action="{{ $table->route('show', [$model]) }}">
                                         <button{{ classTag('btn', 'btn-link', 'p-0', 'text-primary', $model->disabledClasses ? 'disabled' : null) }} type="submit" title="@lang('laravel-table::laravel-table.show')"{{ htmlAttributes($model->disabledClasses ? ['disabled' => 'disabled'] : null) }}>
                                             {!! config('laravel-table.icon.show') !!}
                                         </button>
                                     </form>
                                 @endif
                                 {{-- edit button --}}
                                 @if($table->isRouteDefined('edit'))
-                                    <form id="edit-{{ $model->id }}"
+                                    <form id="edit-{{ $model->getKey() }}"
                                           class="ml-2"
                                           role="form"
                                           method="GET"
-                                          action="{{ $table->route('edit', [$model->id]) }}">
+                                          action="{{ $table->route('edit', [$model]) }}">
                                         <button{{ classTag('btn', 'btn-link', 'p-0', 'text-primary', $model->disabledClasses ? 'disabled' : null) }} type="submit" title="@lang('laravel-table::laravel-table.edit')"{{ htmlAttributes($model->disabledClasses ? ['disabled' => 'disabled'] : null) }}>
                                             {!! config('laravel-table.icon.edit') !!}
                                         </button>
                                     </form>
                                 @endif
                                 {{-- destroy button --}}
                                 @if($table->isRouteDefined('destroy'))
-                                    <form id="destroy-{{ $model->id }}"
+                                    <form id="destroy-{{ $model->getKey() }}"
                                           class="ml-2 destroy"
                                           role="form"
                                           method="POST"
-                                          action="{{ $table->route('destroy', [$model->id]) }}">
+                                          action="{{ $table->route('destroy', [$model]) }}">
                                         @csrf()
                                         @method('DELETE')
                                         <button{{ classTag('btn', 'btn-link', 'p-0', 'text-danger', $model->disabledClasses ? 'disabled' : null) }} type="submit" title="@lang('laravel-table::laravel-table.destroy')"{{ htmlAttributes($model->destroyConfirmationAttributes, $model->disabledClasses ? ['disabled' => 'disabled'] : null) }}>