Skip to content

Commit e4fd3d0

Browse files
committed
Merge branch 'patch-bulk-actions-use-column-utilities' of https://github.com/DeltaSystems/laravel-livewire-tables into DeltaSystems-patch-bulk-actions-use-column-utilities
# Conflicts: # resources/views/tailwind/includes/table.blade.php
2 parents 682840c + ebd8e09 commit e4fd3d0

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

resources/views/bootstrap-4/includes/table.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
<input
116116
wire:model="selected"
117117
wire:loading.attr.delay="disabled"
118-
value="{{ $row->{$primaryKey} }}"
118+
value="{{ $row->{\Rappasoft\LaravelLivewireTables\Utilities\ColumnUtilities::parseField($primaryKey)} }}"
119119
onclick="event.stopPropagation();return true;"
120120
type="checkbox"
121121
/>

resources/views/bootstrap-5/includes/table.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class="form-check-input"
116116
<input
117117
wire:model="selected"
118118
wire:loading.attr.delay="disabled"
119-
value="{{ $row->{$primaryKey} }}"
119+
value="{{ $row->{\Rappasoft\LaravelLivewireTables\Utilities\ColumnUtilities::parseField($primaryKey)} }}"
120120
onclick="event.stopPropagation();return true;"
121121
class="form-check-input"
122122
type="checkbox"

resources/views/tailwind/includes/table.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ class="rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150
125125
<input
126126
wire:model="selected"
127127
wire:loading.attr.delay="disabled"
128-
value="{{ $row->{$primaryKey} }}"
128+
value="{{ $row->{\Rappasoft\LaravelLivewireTables\Utilities\ColumnUtilities::parseField($primaryKey)} }}"
129129
onclick="event.stopPropagation();return true;"
130130
type="checkbox"
131131
class="rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150 ease-in-out focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 dark:bg-gray-900 dark:text-white dark:border-gray-600 dark:hover:bg-gray-600 dark:focus:bg-gray-600"

0 commit comments

Comments
 (0)