@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | $table = request('table'); |
14 | 14 | $label = request('label'); |
15 | 15 | $datatableWhere = urldecode(request('datatable_where')); |
16 | - $datatableFormat = urldecode(Request::get('datatable_format')); |
|
16 | + $datatableFormat = urldecode(Request::get('datatable_format')); |
|
17 | 17 | $foreignKeyName = request('fk_name'); |
18 | 18 | $foreignKeyValue = request('fk_value'); |
19 | 19 | if (! $table || ! $label || ! $foreignKeyName || ! $foreignKeyValue) { |
@@ -23,12 +23,12 @@ discard block |
||
23 | 23 | if ($datatableWhere) { |
24 | 24 | $query->whereRaw($datatableWhere); |
25 | 25 | } |
26 | - if($datatableFormat) { |
|
27 | - $label = $datatableFormat; |
|
28 | - $query->select(DB::raw('id as select_value, CONCAT('.$label.') as select_label')); |
|
29 | - } else { |
|
30 | - $query->select('id as select_value',$label.' as select_label'); |
|
31 | - } |
|
26 | + if($datatableFormat) { |
|
27 | + $label = $datatableFormat; |
|
28 | + $query->select(DB::raw('id as select_value, CONCAT('.$label.') as select_label')); |
|
29 | + } else { |
|
30 | + $query->select('id as select_value',$label.' as select_label'); |
|
31 | + } |
|
32 | 32 | $query->where($foreignKeyName, $foreignKeyValue); |
33 | 33 | $query->orderby('select_label', 'asc'); |
34 | 34 |