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

revert exists filter and replacing by a generic one

Browse Source
This commit is contained in:
Benoît Burnichon
2015-09-24 15:26:33 +02:00
parent 62ba97146d
commit cdb98a1a4e
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/classes/User/Query.php
View File

@@ -68,7 +68,7 @@ class User_Query implements User_QueryInterface
protected $countries = null;
protected $positions = null;
protected $in_ids = null;
protected $existsSql;
protected $sqlFilters = [];
protected $sql_params = null;
public function __construct(Application $app)
@@ -101,9 +101,9 @@ class User_Query implements User_QueryInterface
return $this;
}
public function existsSql($sql)
public function addSqlFilter($sql, array $params = [])
{
$this->existsSql = $sql;
$this->sqlFilters[] = ['sql' => $sql, 'params' => $params];
return $this;
}
@@ -888,8 +888,11 @@ class User_Query implements User_QueryInterface
if ($this->in_ids) {
$sql .= ' AND (Users.id = ' . implode(' OR Users.id = ', $this->in_ids) . ')';
}
if ($this->existsSql) {
$sql .= sprintf(' AND EXISTS(%s)', $this->existsSql);
if ($this->sqlFilters) {
foreach ($this->sqlFilters as $sqlFilter) {
$sql .= ' AND (' . $sqlFilter['sql'] . ')';
$this->sql_params = array_merge($this->sql_params, $sqlFilter['params']);
}
}
if ($this->have_rights) {