From d2881eb85b75310a126efe38b3f3de88c4c6d3f8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 29 Sep 2019 19:22:01 +0200 Subject: [PATCH] FIX CSS Conflicts: htdocs/core/tpl/extrafields_list_search_input.tpl.php --- htdocs/core/class/extrafields.class.php | 2 +- htdocs/core/tpl/extrafields_list_search_input.tpl.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php index 08456ae19ca..dd77e91f7c4 100644 --- a/htdocs/core/class/extrafields.class.php +++ b/htdocs/core/class/extrafields.class.php @@ -1557,7 +1557,7 @@ class ExtraFields { $param_list=array_keys($param['options']); // $param_list='ObjectName:classPath' $showempty=(($required && $default != '')?0:1); - $out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty); + $out=$form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty, '', '', $morecss); } elseif ($type == 'password') { diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php index b4a98946f94..27efb5fd898 100644 --- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php +++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php @@ -36,7 +36,7 @@ if (! empty($extrafieldsobjectkey)) // $extrafieldsobject is the $object->table_ { // for the type as 'checkbox', 'chkbxlst', 'sellist' we should use code instead of id (example: I declare a 'chkbxlst' to have a link with dictionnairy, I have to extend it with the 'code' instead 'rowid') $morecss=''; - if ($typeofextrafield == 'sellist') $morecss='maxwidth200'; + if (in_array($typeofextrafield, array('link', 'sellist'))) $morecss='maxwidth200'; echo $extrafields->showInputField($key, $search_array_options[$search_options_pattern.$tmpkey], '', '', $search_options_pattern, $morecss); } elseif (in_array($typeofextrafield, array('datetime','timestamp')))