Skip to content

Commit 9efff63

Browse files
authored
Merge pull request #508 from rappasoft/develop
v1.19.2
2 parents 682840c + 8241f56 commit 9efff63

File tree

7 files changed

+45
-6
lines changed

7 files changed

+45
-6
lines changed

CHANGELOG.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
44

55
## [Unreleased]
66

7+
## [1.19.2] - 2021-10-15
8+
9+
### Added
10+
11+
- German translation - https://github.com/rappasoft/laravel-livewire-tables/pull/502
12+
13+
### Changed
14+
15+
- Extracts just the field name from primaryKey - https://github.com/rappasoft/laravel-livewire-tables/pull/506
16+
- Update BS4 pagination - https://github.com/rappasoft/laravel-livewire-tables/pull/507
17+
- Update minimum Livewire version to 2.6
18+
719
## [1.19.1] - 2021-10-14
820

921
### Changed
@@ -524,7 +536,8 @@ All notable changes to `laravel-livewire-tables` will be documented in this file
524536

525537
- Initial release
526538

527-
[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.19.1...development
539+
[Unreleased]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.19.2...development
540+
[1.19.2]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.19.2...v1.19.2
528541
[1.19.1]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.18.0...v1.19.1
529542
[1.19.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.18.0...v1.19.0
530543
[1.18.0]: https://github.com/rappasoft/laravel-livewire-tables/compare/v1.17.0...v1.18.0

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
],
2020
"require": {
2121
"php": "^7.4|^8.0",
22-
"livewire/livewire": "^2.0",
22+
"livewire/livewire": "^2.6",
2323
"spatie/laravel-package-tools": "^1.4.3",
2424
"illuminate/contracts": "^8.0"
2525
},

resources/lang/de.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"All": "Alle",
3+
"Applied Filters": "Angewendete Filter",
4+
"Applied Sorting": "Angewendete Sortierung",
5+
"Bulk Actions": "Aktionen",
6+
"Clear": "Zurücksetzen",
7+
"Columns": "Spalten",
8+
"Done Reordering": "Sortieren abgeschlossen",
9+
"Filters": "Filter",
10+
"Remove filter option": "Entferne Filterauswahl",
11+
"Remove sort option": "Entferne Sortierauswahl",
12+
"Search": "Suche",
13+
"Select All": "Alle auswählen",
14+
"Showing": "Anzeigen",
15+
"Unselect All": "Alle abwählen",
16+
"You are currently selecting all": "Es sind schon alle ausgewählt",
17+
"You are not connected to the internet.": "Es liegt keine Verbindung zum Internet vor.",
18+
"You have selected": "Es sind ausgewählt",
19+
"of": "von",
20+
"Reorder": "erneut Sortieren",
21+
"results": "Ergebnisse",
22+
"rows": "Zeilen",
23+
"rows, do you want to select all": "Zeilen, sollen alle ausgewählt werden",
24+
"to": "nach",
25+
"No items found. Try to broaden your search.": "Es gibt keine Ergebnisse/Einträge. Versuche die Suche zu erweitern."
26+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@if ($showPagination)
22
@if ($paginationEnabled && $rows->lastPage() > 1)
33
<div class="row">
4-
<div class="col-12 col-md-6">
4+
<div class="col-12 col-md-6 overflow-auto">
55
{{ $rows->links() }}
66
</div>
77

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)