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

Fix filter on contact category

Browse Source
This commit is contained in:
Laurent Destailleur 2023-02-05 20:16:58 +01:00
parent c69e5a98b1
commit 090c04b904
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/contact/list.php
View File

@ -434,7 +434,6 @@ if ($search_priv != '0' && $search_priv != '1') {
$sql .= " AND (p.priv='1' AND p.fk_user_creat=".((int) $user->id).")"; $sql .= " AND (p.priv='1' AND p.fk_user_creat=".((int) $user->id).")";
} }
} }
$searchCategoryContactList = $search_categ ? array($search_categ) : array(); $searchCategoryContactList = $search_categ ? array($search_categ) : array();
$searchCategoryContactOperator = 0; $searchCategoryContactOperator = 0;
// Search for tag/category ($searchCategoryContactList is an array of ID) // Search for tag/category ($searchCategoryContactList is an array of ID)
@ -443,17 +442,17 @@ if (!empty($searchCategoryContactList)) {
$listofcategoryid = ''; $listofcategoryid = '';
foreach ($searchCategoryContactList as $searchCategoryContact) { foreach ($searchCategoryContactList as $searchCategoryContact) {
if (intval($searchCategoryContact) == -2) { if (intval($searchCategoryContact) == -2) {
$searchCategoryContactSqlList[] = "NOT EXISTS (SELECT ck.fk_socpeople FROM ".MAIN_DB_PREFIX."categorie_contact as ck WHERE s.rowid = ck.fk_socpeople)"; $searchCategoryContactSqlList[] = "NOT EXISTS (SELECT ck.fk_socpeople FROM ".MAIN_DB_PREFIX."categorie_contact as ck WHERE p.rowid = ck.fk_socpeople)";
} elseif (intval($searchCategoryContact) > 0) { } elseif (intval($searchCategoryContact) > 0) {
if ($searchCategoryContactOperator == 0) { if ($searchCategoryContactOperator == 0) {
$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_socpeople FROM ".MAIN_DB_PREFIX."categorie_contact as ck WHERE s.rowid = ck.fk_socpeople AND ck.fk_categorie = ".((int) $searchCategoryContact).")"; $searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_socpeople FROM ".MAIN_DB_PREFIX."categorie_contact as ck WHERE p.rowid = ck.fk_socpeople AND ck.fk_categorie = ".((int) $searchCategoryContact).")";
} else { } else {
$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryContact); $listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryContact);
} }
} }
} }
if ($listofcategoryid) { if ($listofcategoryid) {
$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_socpeople FROM ".MAIN_DB_PREFIX."categorie_contact as ck WHERE s.rowid = ck.fk_socpeople AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))"; $searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_socpeople FROM ".MAIN_DB_PREFIX."categorie_contact as ck WHERE p.rowid = ck.fk_socpeople AND ck.fk_categorie IN (".$db->sanitize($listofcategoryid)."))";
} }
if ($searchCategoryContactOperator == 1) { if ($searchCategoryContactOperator == 1) {
if (!empty($searchCategoryContactSqlList)) { if (!empty($searchCategoryContactSqlList)) {