Skip to content

Commit ac6967b

Browse files
committed
Merge branch 'izzyp-patch-1' into develop
2 parents ca995ca + 51f25fc commit ac6967b

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

resources/views/includes/_body.blade.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ class="{{ $this->setTableDataClass($column->attribute, Arr::get($model->toArray(
4141
@else
4242
@if ($column->isHtml())
4343
@if ($column->isCustomAttribute())
44-
{{ new \Illuminate\Support\HtmlString($model->{$column->attribute}) }}
44+
{{ new \Illuminate\Support\HtmlString(data_get($model, $column->attribute)) }}
4545
@else
4646
{{ new \Illuminate\Support\HtmlString(Arr::get($model->toArray(), $column->attribute)) }}
4747
@endif
4848
@elseif ($column->isUnescaped())
4949
@if ($column->isCustomAttribute())
50-
{!! $model->{$column->attribute} !!}
50+
{!! data_get($model, $column->attribute) !!}
5151
@else
5252
{!! Arr::get($model->toArray(), $column->attribute) !!}
5353
@endif
5454
@else
5555
@if ($column->isCustomAttribute())
56-
{{ $model->{$column->attribute} }}
56+
{{ data_get($model, $column->attribute) }}
5757
@else
5858
{{ Arr::get($model->toArray(), $column->attribute) }}
5959
@endif

src/Traits/Checkboxes.php

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
*/
88
trait Checkboxes
99
{
10-
/**
11-
* Checboxes.
12-
*/
1310

1411
/**
1512
* Whether or not checkboxes are enabled.
@@ -46,7 +43,10 @@ trait Checkboxes
4643
*/
4744
public $checkboxValues = [];
4845

49-
public function updatedCheckboxAll()
46+
/**
47+
* Adds all the id's to the checkbox array
48+
*/
49+
public function updatedCheckboxAll() : void
5050
{
5151
$this->checkboxValues = [];
5252

@@ -57,7 +57,10 @@ public function updatedCheckboxAll()
5757
}
5858
}
5959

60-
public function updatedCheckboxValues()
60+
/**
61+
* Toggles the checkbox that selects/deselects all of the checkboxes
62+
*/
63+
public function updatedCheckboxValues() : void
6164
{
6265
$this->checkboxAll = false;
6366
}

0 commit comments

Comments
 (0)