Skip to content

ignore unbound columns #191

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ignore unbound columns #191

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d36779d
ignore unbound columns
Remo Jan 24, 2015
9fab9d5
make sure we don't order by empty column names
Remo Jan 24, 2015
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
6 changes: 3 additions & 3 deletions src/Bllim/Datatables/Datatables.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ protected function ordering()

for ($i = 0, $c = count($this->input['order']); $i < $c; $i++) {
$order_col = (int)$this->input['order'][$i]['column'];
if (isset($columns[$order_col])) {
if (isset($columns[$order_col]) && $columns[$order_col] !== '') {
if ($this->input['columns'][$order_col]['orderable'] == "true") {
$this->query->orderBy($columns[$order_col], $this->input['order'][$i]['dir']);
}
Expand Down Expand Up @@ -687,7 +687,7 @@ protected function filtering()
$this->query->where(function ($query) use (&$that, $column_aliases, $column_names) {

for ($i = 0, $c = count($that->input['columns']); $i < $c; $i++) {
if (isset($column_aliases[$i]) && $that->input['columns'][$i]['searchable'] == "true") {
if (isset($column_aliases[$i]) && $that->input['columns'][$i]['searchable'] == "true" && $that->input['columns'][$i]['data'] !== '') {

// if filter column exists for this columns then use user defined method
if (isset($that->filter_columns[$column_aliases[$i]])) {
Expand Down Expand Up @@ -756,7 +756,7 @@ protected function filtering()

// column search
for ($i = 0, $c = count($this->input['columns']); $i < $c; $i++) {
if (isset($column_aliases[$i]) && $this->input['columns'][$i]['orderable'] == "true" && $this->input['columns'][$i]['search']['value'] != '') {
if (isset($column_aliases[$i]) && $this->input['columns'][$i]['orderable'] == "true" && $this->input['columns'][$i]['search']['value'] != '' && $this->input['columns'][$i]['data'] !== '') {
// if filter column exists for this columns then use user defined method
if (isset($this->filter_columns[$column_aliases[$i]])) {

Expand Down