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

Fix management of enabled property extrafields

Browse Source
This commit is contained in:
Laurent Destailleur 2018-05-13 14:27:40 +02:00
parent c76e866f41
commit a2d485c14f
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,38 +39,50 @@ class ExtraFields
var $db; var $db;
// type of element (for what object is the extrafield) // type of element (for what object is the extrafield)
// @deprecated
var $attribute_elementtype; var $attribute_elementtype;
// Array with type of the extra field // Array with type of the extra field
// @deprecated
var $attribute_type; var $attribute_type;
// Array with label of extra field // Array with label of extra field
// @deprecated
var $attribute_label; var $attribute_label;
// Array with size of extra field // Array with size of extra field
// @deprecated
var $attribute_size; var $attribute_size;
// array with list of possible values for some types of extra fields // array with list of possible values for some types of extra fields
// @deprecated
var $attribute_choice; var $attribute_choice;
// Array to store compute formula for computed fields // Array to store compute formula for computed fields
// @deprecated
var $attribute_computed; var $attribute_computed;
// Array to store default value // Array to store default value
// @deprecated
var $attribute_default; var $attribute_default;
// Array to store if attribute is unique or not // Array to store if attribute is unique or not
// @deprecated
var $attribute_unique; var $attribute_unique;
// Array to store if attribute is required or not // Array to store if attribute is required or not
// @deprecated
var $attribute_required; var $attribute_required;
// Array to store parameters of attribute (used in select type) // Array to store parameters of attribute (used in select type)
// @deprecated
var $attribute_param; var $attribute_param;
// Array to store position of attribute // Array to store position of attribute
// @deprecated
var $attribute_pos; var $attribute_pos;
// Array to store if attribute is editable regardless of the document status // Array to store if attribute is editable regardless of the document status
// @deprecated
var $attribute_alwayseditable; var $attribute_alwayseditable;
// Array to store permission to check // Array to store permission to check
// @deprecated
var $attribute_perms; var $attribute_perms;
// Array to store language file to translate label of values // Array to store language file to translate label of values
// @deprecated
var $attribute_langfile; var $attribute_langfile;
// Array to store if field is visible by default on list // Array to store if field is visible by default on list
// @deprecated
var $attribute_list; var $attribute_list;
// Array to store if extra field is hidden
var $attribute_hidden; // warning, do not rely on this. If your module need a hidden data, it must use its own table.
// New array to store extrafields definition // New array to store extrafields definition
var $attributes; var $attributes;
@ -126,7 +138,6 @@ class ExtraFields
$this->attribute_perms = array(); $this->attribute_perms = array();
$this->attribute_langfile = array(); $this->attribute_langfile = array();
$this->attribute_list = array(); $this->attribute_list = array();
$this->attribute_hidden = array();
} }
/** /**
@ -758,7 +769,7 @@ class ExtraFields
// We should not have several time this log. If we have, there is some optimization to do by calling a simple $object->fetch_optionals() that include cache management. // We should not have several time this log. If we have, there is some optimization to do by calling a simple $object->fetch_optionals() that include cache management.
dol_syslog("fetch_name_optionals_label elementtype=".$elementtype); dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);
$sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,fielddefault,fieldcomputed,entity"; $sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,fielddefault,fieldcomputed,entity,enabled";
$sql.= " FROM ".MAIN_DB_PREFIX."extrafields"; $sql.= " FROM ".MAIN_DB_PREFIX."extrafields";
$sql.= " WHERE entity IN (0,".$conf->entity.")"; $sql.= " WHERE entity IN (0,".$conf->entity.")";
if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'"; // Filed with object->table_element if ($elementtype) $sql.= " AND elementtype = '".$elementtype."'"; // Filed with object->table_element
@ -812,6 +823,7 @@ class ExtraFields
$this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list; $this->attributes[$tab->elementtype]['list'][$tab->name]=$tab->list;
$this->attributes[$tab->elementtype]['entityid'][$tab->name]=$tab->entity; $this->attributes[$tab->elementtype]['entityid'][$tab->name]=$tab->entity;
$this->attributes[$tab->elementtype]['entitylabel'][$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]); $this->attributes[$tab->elementtype]['entitylabel'][$tab->name]=(empty($labelmulticompany[$tab->entity])?'Entity'.$tab->entity:$labelmulticompany[$tab->entity]);
$this->attributes[$tab->elementtype]['enabled'][$tab->name]=$tab->enabled;
$this->attributes[$tab->elementtype]['loaded']=1; $this->attributes[$tab->elementtype]['loaded']=1;
} }
@ -884,7 +896,7 @@ class ExtraFields
$param=$this->attribute_param[$key]; $param=$this->attribute_param[$key];
$langfile=$this->attribute_langfile[$key]; $langfile=$this->attribute_langfile[$key];
$list=$this->attribute_list[$key]; $list=$this->attribute_list[$key];
$hidden=$this->attribute_hidden[$key]; $hidden=(empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
} }
if ($computed) if ($computed)

6
htdocs/core/tpl/extrafields_view.tpl.php
View File

@ -45,13 +45,17 @@ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object,
print $hookmanager->resPrint; print $hookmanager->resPrint;
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
//var_dump($extrafields->attributes); //var_dump($extrafields->attributes[$object->table_element]);
if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label'])) if (empty($reshook) && is_array($extrafields->attributes[$object->table_element]['label']))
{ {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
{ {
// Discard if extrafield is a hidden field on form // Discard if extrafield is a hidden field on form
$enabled = 1; $enabled = 1;
if ($enabled && isset($extrafields->attributes[$object->table_element]['enabled'][$key]))
{
$enabled = dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1);
}
if ($enabled && isset($extrafields->attributes[$object->table_element]['list'][$key])) if ($enabled && isset($extrafields->attributes[$object->table_element]['list'][$key]))
{ {
$enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1); $enabled = dol_eval($extrafields->attributes[$object->table_element]['list'][$key], 1);