From cd5e1d603e8dc26e312dc1d186298749537a847f Mon Sep 17 00:00:00 2001 From: Alexis LAURIER Date: Wed, 14 Jul 2021 12:02:03 +0200 Subject: [PATCH 1/2] fix showInputField checkbox and radio type --- htdocs/core/class/commonobject.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 9e6204bd364..a726987c607 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -5898,7 +5898,10 @@ abstract class CommonObject $type = 'varchar'; } elseif (is_array($this->fields[$key]['arrayofkeyval'])) { $param['options'] = $this->fields[$key]['arrayofkeyval']; - $type = 'select'; + $type = $this->fields[$key]['type']; + if(!in_array($type, array('select', 'checkbox', 'radio'))) { + $type = 'select'; + } } else { $param['options'] = array(); $type = $this->fields[$key]['type']; From a773652c04e4158ab9661e48db7fac0b97106dcd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 14 Jul 2021 14:37:07 +0200 Subject: [PATCH 2/2] Fix phpcs --- htdocs/core/class/commonobject.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php index 51254bede5d..d050af4883a 100644 --- a/htdocs/core/class/commonobject.class.php +++ b/htdocs/core/class/commonobject.class.php @@ -5918,8 +5918,10 @@ abstract class CommonObject } elseif (is_array($this->fields[$key]['arrayofkeyval'])) { $param['options'] = $this->fields[$key]['arrayofkeyval']; $type = $this->fields[$key]['type']; - if(!in_array($type, array('select', 'checkbox', 'radio'))) { + if (!in_array($type, array('select', 'checkbox', 'radio'))) { $type = 'select'; + } else { + $type = $this->fields[$key]['type']; } } else { $param['options'] = array();