Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.0] Added optional merge of config raw columns to rawColumns method #1960

Merged
merged 3 commits into from
Jan 29, 2019
Merged

[8.0] Added optional merge of config raw columns to rawColumns method #1960

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec30459
Added optional merge of config raw columns to rawColumns method
Spodnet Jan 16, 2019
71339a0
Fixing Style CI issue
Spodnet Jan 16, 2019
2c9f94d
Updated docblock comment
Spodnet Jan 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/DataTableAbstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,21 @@ public function escapeColumns($columns = '*')

/**
* Set columns that should not be escaped.
* Optionally merge the defaults from config.
*
* @param array $columns
* @param bool $merge
* @return $this
*/
public function rawColumns(array $columns)
public function rawColumns(array $columns, $merge = false)
{
$this->columnDef['raw'] = $columns;
if ($merge) {
$config = $this->config->get('datatables.columns');

$this->columnDef['raw'] = array_merge($config['raw'], $columns);
} else {
$this->columnDef['raw'] = $columns;
}

return $this;
}
Expand Down