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

fix extrafield conf cache

Browse Source
This commit is contained in:
ATM john 2020-02-23 10:09:47 +01:00
parent 281e059487
commit ff6dc735ee
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
htdocs/core/class/commondocgenerator.class.php
View File

@ -49,6 +49,10 @@ abstract class CommonDocGenerator
*/ */
protected $db; protected $db;
/**
* @var Extrafields object
*/
public $extrafieldsCache;
/** /**
* Constructor * Constructor
@ -1122,14 +1126,9 @@ abstract class CommonDocGenerator
// Load extrafiels if not allready does // Load extrafiels if not allready does
if(!isset($this->extrafieldsCache)){ $this->extrafieldsCache = array(); } if(empty($this->extrafieldsCache)){ $this->extrafieldsCache = new ExtraFields($this->db); }
if(!isset($this->extrafieldsCache[$object->table_element])){ if(empty($this->extrafieldsCache->attributes[$object->table_element])){ $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
$extrafields = new ExtraFields($this->db); $extrafields = $this->extrafieldsCache;
$extrafields->fetch_name_optionals_label($object->table_element);
}
else{
$extrafields = $this->extrafieldsCache[$object->table_element];
}
$extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element); $extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
@ -1172,14 +1171,9 @@ abstract class CommonDocGenerator
} }
// Load extrafiels if not allready does // Load extrafiels if not allready does
if(!isset($this->extrafieldsCache)){ $this->extrafieldsCache = array(); } if(empty($this->extrafieldsCache)){ $this->extrafieldsCache = new ExtraFields($this->db); }
if(!isset($this->extrafieldsCache[$object->table_element])){ if(empty($this->extrafieldsCache->attributes[$object->table_element])){ $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
$extrafields = new ExtraFields($this->db); $extrafields = $this->extrafieldsCache;
$extrafields->fetch_name_optionals_label($object->table_element);
}
else{
$extrafields = $this->extrafieldsCache[$object->table_element];
}
/** /**
@ -1327,14 +1321,13 @@ abstract class CommonDocGenerator
return; return;
} }
$extrafields = new ExtraFields($this->db); // Load extrafiels if not allready does
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element); if(empty($this->extrafieldsCache)){ $this->extrafieldsCache = new ExtraFields($this->db); }
if(empty($this->extrafieldsCache->attributes[$object->table_element])){ $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
$extrafields = $this->extrafieldsCache;
if (is_array($extrafields->attributes[$object->table_element]['label'])) { if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {
// For cache on lines loop
if(!isset($this->extrafieldsCache)){ $this->extrafieldsCache = array(); }
$this->extrafieldsCache[$object->table_element] = $extrafields;
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
{ {