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

json query path

Browse Source
This commit is contained in:
Frédéric FRANCE 2019-10-02 22:15:24 +02:00
parent 91761e8185
commit feaa5e2bd0
No known key found for this signature in database
GPG Key ID: 06809324E4B2ABC1
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/contact/list.php
View File

@ -345,7 +345,7 @@ if (strlen($search_fax)) $sql.= natural_search('p.fax', $search_fax);
if (! empty($conf->socialnetworks->enabled)) { if (! empty($conf->socialnetworks->enabled)) {
foreach ($socialnetworks as $key => $value) { foreach ($socialnetworks as $key => $value) {
if ($value['active'] && strlen($search_{$key})) { if ($value['active'] && strlen($search_{$key})) {
$sql.= natural_search("p.socialnetworks->>'$.".$key."'", $search_{$key}); $sql.= natural_search("p.socialnetworks->'$.".$key."'", $search_{$key});
} }
} }
} }

7
htdocs/core/lib/company.lib.php
View File

@ -895,7 +895,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
//Social media //Social media
foreach ($socialnetworks as $key => $value) { foreach ($socialnetworks as $key => $value) {
if ($value['active']) { if ($value['active']) {
$searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->>'$.".$key."'"; $searchAddressPhoneDBFields['t.'.$key] = "t.socialnetworks->'$.".$key."'";
} }
} }
@ -948,7 +948,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
{ {
$queryName = 'search_'.substr($key, 2); $queryName = 'search_'.substr($key, 2);
if (GETPOST($queryName, 'alpha')){ if (GETPOST($queryName, 'alpha')){
$search[$key]=GETPOST($queryName, 'alpha'); $search[substr($key, 2)]=GETPOST($queryName, 'alpha');
} }
} }
$search_array_options=$extrafields->getOptionalsFromPost($contactstatic->table_element, '', 'search_'); $search_array_options=$extrafields->getOptionalsFromPost($contactstatic->table_element, '', 'search_');
@ -1047,8 +1047,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
if (in_array($key, array('statut'))){ if (in_array($key, array('statut'))){
print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0, 1),'1'=>$contactstatic->LibStatut(1, 1)), $search_status); print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0, 1),'1'=>$contactstatic->LibStatut(1, 1)), $search_status);
} else { } else {
$fieldName = substr($key, 2); print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
print sprintf('<input type="text" class="flat maxwidth75" name="search_%s" value="%s">', $fieldName, dol_escape_htmltag($search[$key]));
} }
print '</td>'; print '</td>';
} }