From c832898cde529c9be379958a057bdf69b318fe34 Mon Sep 17 00:00:00 2001 From: Thomas Schiavello Date: Wed, 25 Sep 2019 08:53:36 +0200 Subject: [PATCH] fixed enum format problem when value is boolean --- src/Model/TableSchema.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Model/TableSchema.php b/src/Model/TableSchema.php index 8526672..63dec5e 100644 --- a/src/Model/TableSchema.php +++ b/src/Model/TableSchema.php @@ -137,7 +137,7 @@ public function getColumnOptions($column) { if($this->getColumnType($column) == 'bool') { return [1 => __('Sì'), 0 => __('No')]; } - return isset($this->_columns[$column]['options'])?$this->_columns[$column]['options']:$this->getColumnEnum($column); + return isset($this->_columns[$column]['options'])?$this->_columns[$column]['options']:[]; } public function getColumnRenderer($column) { @@ -320,8 +320,13 @@ public function _formatEnum($value, $column, $row, $options = []) { } $enum = $this->_enumFlattenOptions[$column]; - if($enum && isset($enum[(string)$value])) { - return $enum[(string)$value]; + if($enum) { + if(isset($enum[$value])) { + return $enum[$value]; + } + if(isset($enum[(string)$value])) { + return $enum[(string)$value]; + } } return $value; }