Skip to content

Commit 19d5690

Browse files
committed
Merge branch 'release/v5.11.0'
2 parents e945983 + 42da23a commit 19d5690

File tree

3 files changed

+26
-0
lines changed

3 files changed

+26
-0
lines changed

change-log.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
##Change Log
1010

11+
###v5.11.0
12+
- Add support for rendering view directly on addColumn and editColumn.
13+
1114
###v5.10.0
1215
- Add LaravelDataTables on js window namespace. Issue #129. Credits to @greabock.
1316

src/yajra/Datatables/Helper.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ public static function compileContent($content, array $data, $param)
6868
*/
6969
public static function compileBlade($str, $data = [])
7070
{
71+
if (view()->exists($str)) {
72+
return view($str, $data)->render();
73+
}
74+
7175
$empty_filesystem_instance = new Filesystem();
7276
$blade = new BladeCompiler($empty_filesystem_instance, 'datatables');
7377
$parsed_string = $blade->compileString($str);

tests/helper.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,22 @@ function app($instance) {
1919

2020
return new Datatables(Request::capture());
2121
}
22+
23+
function view($view = null, array $data = []) {
24+
if ( ! $view) {
25+
return new BladeView();
26+
}
27+
28+
return (new BladeView())->exists($view);
29+
}
30+
31+
/**
32+
* Blade View Stub
33+
*/
34+
class BladeView
35+
{
36+
public function exists($view)
37+
{
38+
return false;
39+
}
40+
}

0 commit comments

Comments
 (0)