lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix setup class

Browse Source
This commit is contained in:
ATM john 2022-01-09 10:24:28 +01:00
parent eddc2a1a26
commit bb1ec5940d
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
htdocs/core/class/html.formsetup.class.php
View File

@ -215,7 +215,7 @@ class FormSetup
$out = '<table class="noborder centpercent">'; $out = '<table class="noborder centpercent">';
$out .= '<thead>'; $out .= '<thead>';
$out .= '<tr class="liste_titre">'; $out .= '<tr class="liste_titre">';
$out .= ' <td class="titlefield">' . $this->langs->trans("Parameter") . '</td>'; $out .= ' <td>' . $this->langs->trans("Parameter") . '</td>';
$out .= ' <td>' . $this->langs->trans("Value") . '</td>'; $out .= ' <td>' . $this->langs->trans("Value") . '</td>';
$out .= '</tr>'; $out .= '</tr>';
$out .= '</thead>'; $out .= '</thead>';
@ -353,7 +353,8 @@ class FormSetup
*/ */
$item = new FormSetupItem($confKey); $item = new FormSetupItem($confKey);
$item->setTypeFromTypeString($params['type']); // need to be ignored from scrutinizer setTypeFromTypeString was created as deprecated to incite developper to use object oriented usage
/** @scrutinizer ignore-deprecated */ $item->setTypeFromTypeString($params['type']);
if (!empty($params['enabled'])) { if (!empty($params['enabled'])) {
$item->enabled = $params['enabled']; $item->enabled = $params['enabled'];
@ -560,13 +561,16 @@ class FormSetupItem
/** @var string $helpText */ /** @var string $helpText */
public $helpText = ''; public $helpText = '';
/** @var string $value */ /** @var string $fieldValue */
public $fieldValue; public $fieldValue;
/** @var array $fieldAttr fields attribute only for compatible fields like input text */
public $fieldAttr;
/** @var bool|string set this var to override field output will override $fieldInputOverride and $fieldOutputOverride too */ /** @var bool|string set this var to override field output will override $fieldInputOverride and $fieldOutputOverride too */
public $fieldOverride = false; public $fieldOverride = false;
/** @var bool|string set this var to override field output */ /** @var bool|string set this var to override field input */
public $fieldInputOverride = false; public $fieldInputOverride = false;
/** @var bool|string set this var to override field output */ /** @var bool|string set this var to override field output */
@ -583,6 +587,7 @@ class FormSetupItem
/** /**
* TODO each type must have setAs{type} method to help configuration * TODO each type must have setAs{type} method to help configuration
* And set var as protected when its done configuration must be done by method * And set var as protected when its done configuration must be done by method
* this is important for retrocompatibility of futures versions
* @var string $type 'string', 'textarea', 'category:'.Categorie::TYPE_CUSTOMER', 'emailtemplate', 'thirdparty_type' * @var string $type 'string', 'textarea', 'category:'.Categorie::TYPE_CUSTOMER', 'emailtemplate', 'thirdparty_type'
*/ */
protected $type = 'string'; protected $type = 'string';
@ -594,13 +599,19 @@ class FormSetupItem
/** /**
* Constructor * Constructor
* *
* @param $confKey the conf key used in database * @param string $confKey the conf key used in database
*/ */
public function __construct($confKey) public function __construct($confKey)
{ {
global $langs, $db, $conf; global $langs, $db, $conf, $form;
$this->db = $db; $this->db = $db;
$this->form = new Form($this->db);
if (!empty($form) && is_object($form) && get_class($form) == 'Form') { // the form class has a cache inside so I am using it to optimize
$this->form = $form;
} else {
$this->form = new Form($this->db);
}
$this->langs = $langs; $this->langs = $langs;
$this->entity = $conf->entity; $this->entity = $conf->entity;
@ -700,6 +711,10 @@ class FormSetupItem
return $this->fieldInputOverride; return $this->fieldInputOverride;
} }
$this->fieldAttr['name'] = $this->confKey;
$this->fieldAttr['id'] = 'setup-'.$this->confKey;
$this->fieldAttr['value'] = $this->fieldValue;
$out = ''; $out = '';
if ($this->type == 'title') { if ($this->type == 'title') {
@ -726,7 +741,9 @@ class FormSetupItem
$out.= $this->form->select_produits($selected, $this->confKey, '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, $this->cssClass, 0, '', null, 1); $out.= $this->form->select_produits($selected, $this->confKey, '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, $this->cssClass, 0, '', null, 1);
} }
} else { } else {
$out.= '<input name="'.$this->confKey.'" class="flat '.(empty($this->cssClass) ? 'minwidth200' : $this->cssClass).'" value="'.$this->fieldValue.'">'; if (empty($this->fieldAttr)) { $this->fieldAttr['class'] = 'flat '.(empty($this->cssClass) ? 'minwidth200' : $this->cssClass); }
$out.= '<input '.FormSetup::generateAttributesStringFromArray($this->fieldAttr).' />';
} }
return $out; return $out;