From a8637326d3df5fa9f8116490365d87179d957825 Mon Sep 17 00:00:00 2001 From: Joe <104938042+lrljoe@users.noreply.github.com> Date: Fri, 28 Feb 2025 23:30:16 +0000 Subject: [PATCH 1/2] Link column fix (#2223) (#2224) * Link column fix (#2223) * Add handling for From field for "LinkColumn" * Update ChangeLog --- CHANGELOG.md | 4 ++++ src/Views/Columns/LinkColumn.php | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc56fe69d..b30c7d9f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to `laravel-livewire-tables` will be documented in this file +## [v3.7.1] - 2025-02-28 +### Bug Fixes +- Ensure that LinkColumn is included in query if "from" is defined + ## [v3.7.0] - 2025-02-27 ### Bug Fixes diff --git a/src/Views/Columns/LinkColumn.php b/src/Views/Columns/LinkColumn.php index 2c024e391..bc5a6f960 100644 --- a/src/Views/Columns/LinkColumn.php +++ b/src/Views/Columns/LinkColumn.php @@ -22,7 +22,9 @@ public function __construct(string $title, ?string $from = null) { parent::__construct($title, $from); - $this->label(fn () => null); + if (! isset($from)) { + $this->label(fn () => null); + } } public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View From d9b78959716287353b63ca8e0597787eb8028a13 Mon Sep 17 00:00:00 2001 From: daniel-skopek Date: Sat, 26 Apr 2025 23:52:23 +0200 Subject: [PATCH 2/2] Improved pagination UX --- resources/views/specific/bootstrap-4/pagination.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/specific/bootstrap-4/pagination.blade.php b/resources/views/specific/bootstrap-4/pagination.blade.php index 35f76cd59..2449323b6 100644 --- a/resources/views/specific/bootstrap-4/pagination.blade.php +++ b/resources/views/specific/bootstrap-4/pagination.blade.php @@ -3,7 +3,7 @@ @php(isset($this->numberOfPaginatorsRendered[$paginator->getPageName()]) ? $this->numberOfPaginatorsRendered[$paginator->getPageName()]++ : $this->numberOfPaginatorsRendered[$paginator->getPageName()] = 1)