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

Fix ajax search product that return bad json response

Browse Source
This commit is contained in:
Laurent Destailleur 2017-06-12 12:42:06 +02:00
parent 8f7371cdf0
commit cd08690646
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/product/ajax/products.php
View File

@ -171,15 +171,21 @@ else
top_httphead(); top_httphead();
if (empty($htmlname)) if (empty($htmlname))
{
print json_encode(array());
return; return;
}
$match = preg_grep('/(' . $htmlname . '[0-9]+)/', array_keys($_GET)); $match = preg_grep('/(' . $htmlname . '[0-9]+)/', array_keys($_GET));
sort($match); sort($match);
$idprod = (! empty($match[0]) ? $match[0] : ''); $idprod = (! empty($match[0]) ? $match[0] : '');
if (! GETPOST($htmlname) && ! GETPOST($idprod)) if (GETPOST($htmlname) == '' && ! GETPOST($idprod))
{
print json_encode(array());
return; return;
}
// When used from jQuery, the search term is added as GET param "term". // When used from jQuery, the search term is added as GET param "term".
$searchkey = (GETPOST($idprod) ? GETPOST($idprod) : (GETPOST($htmlname) ? GETPOST($htmlname) : '')); $searchkey = (GETPOST($idprod) ? GETPOST($idprod) : (GETPOST($htmlname) ? GETPOST($htmlname) : ''));