Skip to content

Commit 4e17a13

Browse files
committed
Patch ticket datatable: Non existent dep_ancestor_name
1 parent fc5beeb commit 4e17a13

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

src/Controllers/TicketsController.php

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,16 @@ public function data($ticketList = 'active')
127127
$collection->leftJoin('panichd_departments', 'panichd_departments.id', '=', 'panichd_members.department_id')
128128
->leftJoin('panichd_departments as dep_ancestor', 'panichd_departments.department_id', '=', 'dep_ancestor.id');
129129

130-
// Department columns
131-
$a_select[] = 'dep_ancestor.name as dep_ancestor_name';
132-
$a_select[] = \DB::raw('concat_ws(\'' . trans('panichd::lang.colon') . ' \', dep_ancestor.name, panichd_departments.name) as dept_full_name');
130+
// Department columns
131+
$a_select[] = \DB::raw('CASE panichd_departments.department_id WHEN NULL THEN "" ELSE dep_ancestor.name END as dep_ancestor_name');
132+
133+
if (config('database.default')=='sqlite'){
134+
$a_select[] = \DB::raw('dep_ancestor.name + panichd_departments.name as dept_full_name'); #\''.trans('panichd::lang.colon').' +
135+
}else{
136+
$a_select[] = \DB::raw('concat_ws(\'' . trans('panichd::lang.colon') . ' \', dep_ancestor.name, panichd_departments.name) as dept_full_name');
137+
}
138+
}else{
139+
$a_select[] = '"" as dep_ancestor_name';
133140
}
134141

135142
$currentLevel = $agent->currentLevel();

0 commit comments

Comments
 (0)