hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 12:03:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #159 : push search filters

Browse Source
This commit is contained in:
Romain Neutron
2012-01-05 12:37:26 +01:00
parent e5648b9335
commit 9a10f70859
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/classes/deprecated/push.api.php
View File

@@ -845,7 +845,7 @@ function sqlFromFilters($usr, $filters)
$c['country' . $n] = $country; $c['country' . $n] = $country;
} }
$n++; $n++;
$precise.=" AND usr.pays IN (" . implode(", ", array_keys($c)) . ")"; $precise.=" AND usr.pays IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c); $params = array_merge($params, $c);
} }
if (count($filters->activite) > 0 && trim($filters->activite[0]) != '') if (count($filters->activite) > 0 && trim($filters->activite[0]) != '')
@@ -857,7 +857,7 @@ function sqlFromFilters($usr, $filters)
$c['activite' . $n] = $activite; $c['activite' . $n] = $activite;
} }
$n++; $n++;
$precise.=" AND usr.activite IN ('" . implode(", ", array_keys($c)) . "')"; $precise.=" AND usr.activite IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c); $params = array_merge($params, $c);
} }
if (count($filters->fonction) > 0 && trim($filters->fonction[0]) != '') if (count($filters->fonction) > 0 && trim($filters->fonction[0]) != '')
@@ -869,7 +869,7 @@ function sqlFromFilters($usr, $filters)
$c['fonction' . $n] = $fonction; $c['fonction' . $n] = $fonction;
} }
$n++; $n++;
$precise.=" AND usr.fonction IN ('" . implode(", ", array_keys($c)) . "')"; $precise.=" AND usr.fonction IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c); $params = array_merge($params, $c);
} }
if (count($filters->societe) > 0 && trim($filters->societe[0]) != '') if (count($filters->societe) > 0 && trim($filters->societe[0]) != '')
@@ -881,7 +881,7 @@ function sqlFromFilters($usr, $filters)
$c['societe' . $n] = $societe; $c['societe' . $n] = $societe;
} }
$n++; $n++;
$precise.=" AND usr.societe IN ('" . implode(", ", array_keys($c)) . "')"; $precise.=" AND usr.societe IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c); $params = array_merge($params, $c);
} }
if (count($filters->template) > 0 && trim($filters->template[0]) != '') if (count($filters->template) > 0 && trim($filters->template[0]) != '')
@@ -893,7 +893,7 @@ function sqlFromFilters($usr, $filters)
$c['template' . $n] = $template; $c['template' . $n] = $template;
} }
$n++; $n++;
$precise.=" AND usr.lastModel IN ('" . implode(", ", array_keys($c)) . "')"; $precise.=" AND usr.lastModel IN (:" . implode(", :", array_keys($c)) . ")";
$params = array_merge($params, $c); $params = array_merge($params, $c);
} }
} }

8
www/prod/pushdoc.php
View File

@@ -327,6 +327,8 @@ if ($act == "STEP2")
$htmlacti = '<option value="">Toutes</option>'; $htmlacti = '<option value="">Toutes</option>';
foreach ($rs as $row) foreach ($rs as $row)
{ {
if(trim($row['activite']) === '')
continue;
$htmlacti .= '<option value="' . $row['activite'] . '">' . $row['activite'] . '</option>'; $htmlacti .= '<option value="' . $row['activite'] . '">' . $row['activite'] . '</option>';
} }
@@ -334,6 +336,8 @@ if ($act == "STEP2")
$htmlfonction = '<option value="">Toutes</option>'; $htmlfonction = '<option value="">Toutes</option>';
foreach ($rs as $row) foreach ($rs as $row)
{ {
if(trim($row['fonction']) === '')
continue;
$htmlfonction .= '<option value="' . $row['fonction'] . '">' . $row['fonction'] . '</option>'; $htmlfonction .= '<option value="' . $row['fonction'] . '">' . $row['fonction'] . '</option>';
} }
@@ -350,6 +354,8 @@ if ($act == "STEP2")
$htmlsocie = '<option value="">Toutes</option>'; $htmlsocie = '<option value="">Toutes</option>';
foreach ($rs as $row) foreach ($rs as $row)
{ {
if(trim($row['societe']) === '')
continue;
$htmlsocie .= '<option value="' . $row['societe'] . '">' . $row['societe'] . '</option>'; $htmlsocie .= '<option value="' . $row['societe'] . '">' . $row['societe'] . '</option>';
} }
@@ -357,6 +363,8 @@ if ($act == "STEP2")
$htmltemplate = '<option value="">Toutes</option>'; $htmltemplate = '<option value="">Toutes</option>';
foreach ($rs as $row) foreach ($rs as $row)
{ {
if(trim($row['lastModel']) === '')
continue;
$htmltemplate .= '<option value="' . $row['lastModel'] . '">' . $row['lastModel'] . '</option>'; $htmltemplate .= '<option value="' . $row['lastModel'] . '">' . $row['lastModel'] . '</option>';
} }
?> ?>