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

Update html.form.class.php

Browse Source
This commit is contained in:
Laurent Destailleur 2018-12-14 17:32:41 +01:00 committed by GitHub
parent 37f3b8bbde
commit 89909ebab0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/html.form.class.php
View File

@ -1389,7 +1389,7 @@ class Form
* Return HTML code of the SELECT of list of all contacts (for a third party or all). * Return HTML code of the SELECT of list of all contacts (for a third party or all).
* This also set the number of contacts found into $this->num * This also set the number of contacts found into $this->num
* *
* @since 9.0 Add afterSelectOptions hook & selectcontacts context. * @since 9.0 Add afterSelectContactOptions hook
* *
* @param int $socid Id ot third party or 0 for all or -1 for empty list * @param int $socid Id ot third party or 0 for all or -1 for empty list
* @param array|int $selected Array of ID of pre-selected contact id * @param array|int $selected Array of ID of pre-selected contact id
@ -1418,17 +1418,15 @@ class Form
if ($selected === '') $selected = array(); if ($selected === '') $selected = array();
else if (!is_array($selected)) $selected = array($selected); else if (!is_array($selected)) $selected = array($selected);
$out=''; $out='';
// Add selectcontacts hook
if (! is_object($hookmanager)) if (! is_object($hookmanager))
{ {
include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php'; include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
$hookmanager=new HookManager($this->db); $hookmanager=new HookManager($this->db);
} }
$hookmanager->initHooks(array('selectcontacts'));
// On recherche les societes // We search third parties
$sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste"; $sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";
if ($showsoc > 0) $sql.= " , s.nom as company"; if ($showsoc > 0) $sql.= " , s.nom as company";
$sql.= " FROM ".MAIN_DB_PREFIX ."socpeople as sp"; $sql.= " FROM ".MAIN_DB_PREFIX ."socpeople as sp";
@ -1523,7 +1521,7 @@ class Form
'showsoc'=>$showsoc, 'showsoc'=>$showsoc,
); );
$reshook = $hookmanager->executeHooks( 'afterSelectOptions', $parameters, $this, $action ); // Note that $action and $object may have been modified by some hooks $reshook = $hookmanager->executeHooks( 'afterSelectContactOptions', $parameters, $this, $action ); // Note that $action and $object may have been modified by some hooks
if ($htmlname != 'none' || $options_only) if ($htmlname != 'none' || $options_only)
{ {