Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-07 16:41:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression, avoid using global variable

Browse Source
This commit is contained in:
Laurent Destailleur
2024-10-18 15:35:24 +02:00
parent b43f0079d6
commit cf6b02b341
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
htdocs/core/class/extrafields.class.php
View File

@@ -1935,16 +1935,17 @@ class ExtraFields
/**
* Return HTML string to put an output field into a page
*
* @param string $key Key of attribute
* @param string $value Value to show
* @param string $moreparam To add more parameters on html input tag (only checkbox use html input for output rendering)
* @param string $extrafieldsobjectkey Required (for example $object->table_element).
* @param Translate $outputlangs Output language
* @return string Formatted value
* @param string $key Key of attribute
* @param string $value Value to show
* @param string $moreparam To add more parameters on html input tag (only checkbox use html input for output rendering)
* @param string $extrafieldsobjectkey Required (for example $object->table_element).
* @param Translate $outputlangs Output
* @param object $object The parent object of field to show
* @return string Formatted value
*/
public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '', $outputlangs = null)
public function showOutputField($key, $value, $moreparam = '', $extrafieldsobjectkey = '', $outputlangs = null, $object = null)
{
global $conf, $langs, $object;
global $conf, $langs;
if (is_null($outputlangs) || !is_object($outputlangs)) {
$outputlangs = $langs;
@@ -2270,10 +2271,10 @@ class ExtraFields
if (!empty($classpath)) {
dol_include_once($InfoFieldList[1]);
if ($classname && class_exists($classname)) {
$object = new $classname($this->db);
'@phan-var-force CommonObject $object';
$object->fetch($value);
$value = $object->getNomUrl(3);
$tmpobject = new $classname($this->db);
'@phan-var-force CommonObject $tmpobject';
$tmpobject->fetch($value);
$value = $tmpobject->getNomUrl(3);
}
} else {
dol_syslog('Error bad setup of extrafield', LOG_WARNING);
@@ -2303,8 +2304,9 @@ class ExtraFields
} elseif ($type == 'password') {
$value = dol_trunc(preg_replace('/./i', '*', $value), 8, 'right', 'UTF-8', 1);
} elseif ($type == 'stars') {
$value = '<input type="hidden" class="flat" name="'.$key.'" id="'.$key.$object->id.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
$value .= '<div class="star-selection" id="'.$key.$object->id.'_selection">';
$objectid = (int) $object->id;
$value = '<input type="hidden" class="flat" name="'.$key.'" id="'.$key.$objectid.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
$value .= '<div class="star-selection" id="'.$key.$objectid.'_selection">';
$i = 1;
while ($i <= $size) {
$value .= '<span class="star" data-value="'.$i.'">'.img_picto('', 'fontawesome_star_fas').'</span>';
@@ -2313,8 +2315,8 @@ class ExtraFields
$value .= '</div>';
$value .= '<script>
$(document).ready(function() {
let container = $("#'.$key.$object->id.'_selection");
let selectedStars = parseInt($("#'.$key.$object->id.'").val()) || 0;
let container = $("#'.$key.$objectid.'_selection");
let selectedStars = parseInt($("#'.$key.$objectid.'").val()) || 0;
container.find(".star").each(function() {
$(this).toggleClass("active", $(this).data("value") <= selectedStars);
});
@@ -2331,10 +2333,10 @@ class ExtraFields
});
container.find(".star").off("click").on("click", function() {
selectedStars = $(this).data("value");
if (selectedStars == 1 && $("#'.$key.$object->id.'").val() == 1) {
if (selectedStars == 1 && $("#'.$key.$objectid.'").val() == 1) {
selectedStars = 0;
}
container.find("#'.$key.$object->id.'").val(selectedStars);
container.find("#'.$key.$objectid.'").val(selectedStars);
container.find(".star").each(function() {
$(this).toggleClass("active", $(this).data("value") <= selectedStars);
});
@@ -2342,9 +2344,9 @@ class ExtraFields
url: "'.DOL_URL_ROOT.'/core/ajax/editextrafield.php",
method: "POST",
data: {
objectType: "'.$extrafieldsobjectkey.'",
objectId: "'.$object->id.'",
field: "'.$key.'",
objectType: \''.dol_escape_js($extrafieldsobjectkey).'\',
objectId: '.((int) $objectid).',
field: \''.dol_escape_js($key).'\',
value: selectedStars,
token: "'.newToken().'"
},