fixed enum format problem when value is boolean

doshu · Sep 25, 2019 · c832898 · c832898
1 parent 4ba628e
commit c832898
Showing 1 changed file with 8 additions and 3 deletions.
diff --git 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;
         }