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

Standardize extrafields code

Browse Source
This commit is contained in:
Laurent Destailleur 2019-09-28 10:55:09 +02:00
parent e7beadb58a
commit 86e5465197
28 changed files with 56 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/cartes/carte.php
View File

@ -48,7 +48,7 @@ $object=new Adherent($db);
$extrafields = new ExtraFields($db);
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('adherent');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
/*

3
htdocs/adherents/list.php
View File

@ -88,7 +88,8 @@ $hookmanager->initHooks(array('memberlist'));
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('adherent');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// List of fields to search into when doing a "search in all"

3
htdocs/adherents/subscription/list.php
View File

@ -68,7 +68,8 @@ $hookmanager->initHooks(array('subscriptionlist'));
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('subscription');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// List of fields to search into when doing a "search in all"

2
htdocs/adherents/type.php
View File

@ -73,7 +73,7 @@ $object = new AdherentType($db);
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extralabels=$extrafields->fetch_name_optionals_label('adherent_type');
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
{

4
htdocs/admin/emailcollector_card.php
View File

@ -55,8 +55,10 @@ $object = new EmailCollector($db);
$extrafields = new ExtraFields($db);
$diroutputmassaction = $conf->emailcollector->dir_output . '/temp/massgeneration/' . $user->id;
$hookmanager->initHooks(array('emailcollectorcard')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('emailcollector');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Initialize array of search criterias

4
htdocs/admin/emailcollector_list.php
View File

@ -66,8 +66,10 @@ $object = new EmailCollector($db);
$extrafields = new ExtraFields($db);
$diroutputmassaction = $conf->emailcollector->dir_output . '/temp/massgeneration/' . $user->id;
$hookmanager->initHooks(array('emailcollectorlist')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('emailcollector');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Default sort order (if not yet defined by previous GETPOST)

4
htdocs/admin/mails_senderprofile_list.php
View File

@ -59,8 +59,10 @@ $object=new EmailSenderProfile($db);
$extrafields = new ExtraFields($db);
$diroutputmassaction=$conf->admin->dir_output . '/temp/massgeneration/'.$user->id;
$hookmanager->initHooks(array('emailsenderprofilelist')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('emailsenderprofile');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Default sort order (if not yet defined by previous GETPOST)

4
htdocs/asset/card.php
View File

@ -43,8 +43,10 @@ $object=new Asset($db);
$extrafields = new ExtraFields($db);
$diroutputmassaction=$conf->asset->dir_output . '/temp/massgeneration/'.$user->id;
$hookmanager->initHooks(array('assetcard')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('asset');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Initialize array of search criterias

3
htdocs/asset/document.php
View File

@ -60,8 +60,9 @@ $object=new Asset($db);
$extrafields = new ExtraFields($db);
$diroutputmassaction=$conf->assets->dir_output . '/temp/massgeneration/'.$user->id;
$hookmanager->initHooks(array('assetdocument')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('asset');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals

4
htdocs/asset/list.php
View File

@ -60,8 +60,10 @@ $object=new Asset($db);
$extrafields = new ExtraFields($db);
$diroutputmassaction=$conf->asset->dir_output . '/temp/massgeneration/'.$user->id;
$hookmanager->initHooks(array('assetlist')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('asset');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Default sort order (if not yet defined by previous GETPOST)

3
htdocs/asset/note.php
View File

@ -41,8 +41,9 @@ $object=new Asset($db);
$extrafields = new ExtraFields($db);
$diroutputmassaction=$conf->asset->dir_output . '/temp/massgeneration/'.$user->id;
$hookmanager->initHooks(array('assetnote')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('asset');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
// Security check - Protection if external user
//if ($user->societe_id > 0) access_forbidden();

2
htdocs/asset/type.php
View File

@ -65,7 +65,7 @@ $object = new AssetType($db);
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extralabels=$extrafields->fetch_name_optionals_label('asset_type');
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
{

2
htdocs/bom/bom_document.php
View File

@ -63,7 +63,7 @@ $extrafields = new ExtraFields($db);
$diroutputmassaction=$conf->bom->dir_output . '/temp/massgeneration/'.$user->id;
$hookmanager->initHooks(array('bomdocument', 'globalcard')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('bom');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals

4
htdocs/bom/bom_list.php
View File

@ -60,8 +60,10 @@ $object = new BOM($db);
$extrafields = new ExtraFields($db);
$diroutputmassaction = $conf->bom->dir_output . '/temp/massgeneration/'.$user->id;
$hookmanager->initHooks(array('bomlist')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('bom'); // Load $extrafields->attributes['bom']
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element); // Load $extrafields->attributes['bom']
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Default sort order (if not yet defined by previous GETPOST)

3
htdocs/bom/bom_note.php
View File

@ -42,8 +42,9 @@ $object=new BOM($db);
$extrafields = new ExtraFields($db);
$diroutputmassaction=$conf->bom->dir_output . '/temp/massgeneration/'.$user->id;
$hookmanager->initHooks(array('bomnote','globalcard')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('bom');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
// Security check - Protection if external user
//if ($user->societe_id > 0) access_forbidden();

2
htdocs/bom/class/bom.class.php
View File

@ -245,7 +245,7 @@ class BOM extends CommonObject
// Clear extrafields that are unique
if (is_array($object->array_options) && count($object->array_options) > 0)
{
$extrafields->fetch_name_optionals_label($this->element);
$extrafields->fetch_name_optionals_label($object->table_element);
foreach($object->array_options as $key => $option)
{
$shortkey = preg_replace('/options_/', '', $key);

4
htdocs/comm/action/list.php
View File

@ -80,8 +80,10 @@ $object = new ActionComm($db);
$hookmanager->initHooks(array('agendalist'));
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('actioncomm');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// If not choice done on calendar owner, we filter on user.
if (empty($filtert) && empty($conf->global->AGENDA_ALL_CALENDARS))

3
htdocs/comm/mailing/list.php
View File

@ -53,7 +53,8 @@ $hookmanager->initHooks(array('mailinglist'));
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('mailing');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// List of fields to search into when doing a "search in all"

3
htdocs/comm/propal/list.php
View File

@ -129,7 +129,8 @@ $hookmanager->initHooks(array('propallist'));
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('propal');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// List of fields to search into when doing a "search in all"

2
htdocs/commande/class/commande.class.php
View File

@ -1266,7 +1266,7 @@ class Commande extends CommonOrder
$object->fetch_optionals($object->id);
$e = new ExtraFields($this->db);
$element_extrafields = $e->fetch_name_optionals_label($this->element);
$element_extrafields = $e->fetch_name_optionals_label($this->table_element);
foreach($object->array_options as $options_key => $value) {
if(array_key_exists(str_replace('options_', '', $options_key), $element_extrafields)){

2
htdocs/contrat/class/contrat.class.php
View File

@ -2482,7 +2482,7 @@ class Contrat extends CommonObject
// Clean extrafields
if (is_array($clonedObj->array_options) && count($clonedObj->array_options) > 0)
{
$extrafields->fetch_name_optionals_label($this->element);
$extrafields->fetch_name_optionals_label($this->table_element);
foreach($clonedObj->array_options as $key => $option)
{
$shortkey = preg_replace('/options_/', '', $key);

3
htdocs/cron/list.php
View File

@ -70,7 +70,8 @@ $hookmanager->initHooks(array('cronjoblist'));
$extrafields = new ExtraFields($db);
// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('cronjob');
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');

2
htdocs/emailcollector/class/emailcollector.class.php
View File

@ -263,7 +263,7 @@ class EmailCollector extends CommonObject
// Clear extrafields that are unique
if (is_array($object->array_options) && count($object->array_options) > 0)
{
$extrafields->fetch_name_optionals_label($this->element);
$extrafields->fetch_name_optionals_label($this->table_element);
foreach($object->array_options as $key => $option)
{
$shortkey = preg_replace('/options_/', '', $key);

2
htdocs/emailcollector/class/emailcollectoraction.class.php
View File

@ -226,7 +226,7 @@ class EmailCollectorAction extends CommonObject
// Clear extrafields that are unique
if (is_array($object->array_options) && count($object->array_options) > 0)
{
$extrafields->fetch_name_optionals_label($this->element);
$extrafields->fetch_name_optionals_label($this->table_element);
foreach($object->array_options as $key => $option)
{
$shortkey = preg_replace('/options_/', '', $key);

2
htdocs/emailcollector/class/emailcollectorfilter.class.php
View File

@ -201,7 +201,7 @@ class EmailCollectorFilter extends CommonObject
// Clear extrafields that are unique
if (is_array($object->array_options) && count($object->array_options) > 0)
{
$extrafields->fetch_name_optionals_label($this->element);
$extrafields->fetch_name_optionals_label($this->table_element);
foreach($object->array_options as $key => $option)
{
$shortkey = preg_replace('/options_/', '', $key);

2
htdocs/modulebuilder/template/class/myobject.class.php
View File

@ -286,7 +286,7 @@ class MyObject extends CommonObject
// Clear extrafields that are unique
if (is_array($object->array_options) && count($object->array_options) > 0)
{
$extrafields->fetch_name_optionals_label($this->element);
$extrafields->fetch_name_optionals_label($this->table_element);
foreach($object->array_options as $key => $option)
{
$shortkey = preg_replace('/options_/', '', $key);

8
htdocs/modulebuilder/template/myobject_list.php
View File

@ -98,8 +98,14 @@ $object = new MyObject($db);
$extrafields = new ExtraFields($db);
$diroutputmassaction = $conf->mymodule->dir_output . '/temp/massgeneration/'.$user->id;
$hookmanager->initHooks(array('myobjectlist')); // Note that conf->hooks_modules contains array
// Fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label('myobject'); // Load $extrafields->attributes['myobject']
$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
// fetch optionals attributes lines and labels
//$extrafieldsline = new ExtraFields($db);
//$extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_element_line);
$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
// Default sort order (if not yet defined by previous GETPOST)

2
htdocs/ticket/class/ticket.class.php
View File

@ -573,7 +573,7 @@ class Ticket extends CommonObject
$extrafields = new ExtraFields($this->db);
// fetch optionals attributes and labels
$extralabels = $extrafields->fetch_name_optionals_label($this->element);
$extralabels = $extrafields->fetch_name_optionals_label($this->table_element);
$sql = "SELECT";
$sql .= " t.rowid,";