@@ -19,8 +19,8 @@ discard block |
||
19 | 19 | */ |
20 | 20 | public function query($query, $column) |
21 | 21 | { |
22 | - if($option = $column->getOptionsFromTable()) { |
|
23 | - $query->leftjoin($option["table"],$option["table"].'.'.$option["primary_key"],"=", $query->from.'.'.$column->getField()); |
|
22 | + if ($option = $column->getOptionsFromTable()) { |
|
23 | + $query->leftjoin($option["table"], $option["table"].'.'.$option["primary_key"], "=", $query->from.'.'.$column->getField()); |
|
24 | 24 | $query->addSelect($option['table'].'.'.$option['display_field'].' as '.$option['table'].'_'.$option['display_field']); |
25 | 25 | } |
26 | 26 | return $query; |
@@ -32,13 +32,13 @@ discard block |
||
32 | 32 | */ |
33 | 33 | public function indexRender($row, $column) |
34 | 34 | { |
35 | - if($column->getOptionsFromTable()) { |
|
35 | + if ($column->getOptionsFromTable()) { |
|
36 | 36 | $option = $column->getOptionsFromTable(); |
37 | 37 | return $row->{ $option['table'].'_'.$option['display_field'] }; |
38 | - }else{ |
|
38 | + } else { |
|
39 | 39 | $option = $column->getOptions(); |
40 | 40 | $key = $row->{ $column->getField() }; |
41 | - return @$option[ $key ]; |
|
41 | + return @$option[$key]; |
|
42 | 42 | } |
43 | 43 | } |
44 | 44 |