tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QuickTable: fix counting bugy

This commit is contained in:
Thomas Gelf 2016-03-24 02:55:23 +01:00
parent bc19c6aa71
commit d7b765bd04
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/Director/Web/Table/QuickTable.php
View File

@ -136,6 +136,13 @@ abstract class QuickTable implements Paginatable
$query->limit($this->getLimit(), $this->getOffset());
}
$this->applyFiltersToQuery($query);
return $db->fetchAll($query);
}
protected function applyFiltersToQuery($query)
{
$filter = null;
$enforced = $this->enforcedFilters;
if ($this->filter && ! $this->filter->isEmpty()) {
@ -150,7 +157,7 @@ abstract class QuickTable implements Paginatable
$query->where($this->renderFilter($filter));
}
return $db->fetchAll($query);
return $query;
}
public function getPaginator()
@ -164,8 +171,11 @@ abstract class QuickTable implements Paginatable
public function count()
{
$db = $this->connection()->getConnection();
$query = clone($this->getBaseQuery());
$query->reset('order')->columns(array('COUNT(*)'));
$this->applyFiltersToQuery($query);
return $db->fetchOne($this->getBaseQuery()->reset('order')->columns(array('COUNT(*)')));
return $db->fetchOne($query);
}
public function limit($count = null, $offset = null)