Skip to content

Commit 5b326cc

Browse files
authored
Fixes for ButtonGroupColumn, ImageColumn, LinkColumn - to not default as label if has a "from" property. (rappasoft#1932)
* Initial Commit - Allowing Labels with "From" to be included in queries * Fix styling * Fixes for ButtonGroupColumn, ImageColumn, LinkColumn - to not default as label if has a "from" property. --------- Co-authored-by: lrljoe <[email protected]>
1 parent f1e041e commit 5b326cc

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

src/Views/Columns/ButtonGroupColumn.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ public function __construct(string $title, ?string $from = null)
2020
{
2121
parent::__construct($title, $from);
2222

23-
$this->label(fn () => null);
23+
if (! isset($from)) {
24+
$this->label(fn () => null);
25+
}
2426
}
2527

2628
public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|\Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View

src/Views/Columns/ImageColumn.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ class ImageColumn extends Column
2020
public function __construct(string $title, ?string $from = null)
2121
{
2222
parent::__construct($title, $from);
23+
if (! isset($from)) {
24+
$this->label(fn () => null);
25+
}
2326

24-
$this->label(fn () => null);
2527
}
2628

2729
public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View

src/Views/Columns/LinkColumn.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ public function __construct(string $title, ?string $from = null)
2222
{
2323
parent::__construct($title, $from);
2424

25-
$this->label(fn () => null);
25+
if (! isset($from)) {
26+
$this->label(fn () => null);
27+
}
2628
}
2729

2830
public function getContents(Model $row): null|string|\Illuminate\Support\HtmlString|DataTableConfigurationException|\Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View

0 commit comments

Comments
 (0)