diff --git a/controllers/Builder.php b/controllers/Builder.php index 410c5d9..c906152 100644 --- a/controllers/Builder.php +++ b/controllers/Builder.php @@ -179,7 +179,7 @@ public function view($context, $id) $csv_columns = []; $csv_headings = []; foreach ($model->csv_columns as $list_col) { - $col = $list_col['column']; + $col = is_string($list_col['column']) ? json_decode($list_col['column'], true) : $list_col['column']; $csv_columns[] = $col['key']; $csv_headings[] = $list_col['label']; } @@ -210,7 +210,7 @@ public function view($context, $id) $list_columns = []; $sort_column = ''; foreach ($model->list_columns as $list_col) { - $col = json_decode($list_col['column'], true); + $col = is_string($list_col['column']) ? json_decode($list_col['column'], true) : $list_col['column']; $list_columns[$col['key']] = [ 'title' => $list_col['label'], ];