tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-04-07 21:05:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/hosts-without-services-are-hidden-from-restricted-roles-12852'

Browse Source 
fixes #12852
fixes #10537
This commit is contained in:
Alexander A. Klimov 2016-11-03 19:27:30 +01:00
commit 1f74cee21b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/Icinga/Data/Db/DbQuery.php
View File

@ -301,7 +301,7 @@ class DbQuery extends SimpleQuery
if ($sign === '=') {
return $col . ' IN (' . $this->escapeForSql($expression) . ')';
} elseif ($sign === '!=') {
return $col . ' NOT IN (' . $this->escapeForSql($expression) . ')';
return $col . ' NOT IN (' . $this->escapeForSql($expression) . ') OR ' . $col . ' IS NULL';
}
throw new QueryException('Unable to render array expressions with operators other than equal or not equal');
@ -316,9 +316,12 @@ class DbQuery extends SimpleQuery
return new Zend_Db_Expr('FALSE');
}
return $col . ' NOT LIKE ' . $this->escapeForSql($this->escapeWildcards($expression));
return $col . ' NOT LIKE ' . $this->escapeForSql($this->escapeWildcards($expression))
. ' OR ' . $col . ' IS NULL';
} else {
return $col . ' ' . $sign . ' ' . $this->escapeForSql($expression);
return $col . ' ' . $sign . ' ' . $this->escapeForSql($expression) . (
$sign === '!=' ? ' OR ' . $col . ' IS NULL' : ''
);
}
}