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

Data views: Expect a query instance instead of a backend

This commit is contained in:
Eric Lippmann 2014-05-06 18:34:01 +02:00
parent c23e0c3782
commit 97d6feccb8
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/monitoring/library/Monitoring/DataView/DataView.php
View File

@ -30,17 +30,16 @@
namespace Icinga\Module\Monitoring\DataView;
use Icinga\Data\BaseQuery;
use Icinga\Data\Browsable;
use Icinga\Data\PivotTable;
use Icinga\Filter\Filterable;
use Icinga\Filter\Query\Tree;
use Icinga\Module\Monitoring\Backend;
use Icinga\Module\Monitoring\Filter\UrlViewFilter;
use Icinga\Web\Request;
/**
* A read-only view of an underlying Query
*/
abstract class DataView implements Filterable
abstract class DataView implements Browsable, Filterable
{
/**
* Sort in ascending order, default
@ -50,6 +49,7 @@ abstract class DataView implements Filterable
* Sort in reverse order
*/
const SORT_DESC = BaseQuery::SORT_DESC;
/**
* The query used to populate the view
*
@ -60,12 +60,13 @@ abstract class DataView implements Filterable
/**
* Create a new view
*
* @param Backend $ds Which backend to query
* @param array $columns Select columns
* @param BaseQuery $query Which backend to query
* @param array $columns Select columns
*/
public function __construct(Backend $ds, array $columns = null)
public function __construct(BaseQuery $query, array $columns = null)
{
$this->query = $ds->select()->from(static::getQueryName(), $columns === null ? $this->getColumns() : $columns);
$this->query = $query;
$this->query->columns($columns === null ? $this->getColumns() : $columns);
}
/**
@ -99,7 +100,6 @@ abstract class DataView implements Filterable
*/
public static function fromRequest($request, array $columns = null)
{
$view = new static(Backend::createBackend($request->getParam('backend')), $columns);
$parser = new UrlViewFilter($view);
$view->getQuery()->setFilter($parser->fromRequest($request));
@ -267,4 +267,17 @@ abstract class DataView implements Filterable
$this->query->addFilter($filter);
return $this;
}
/**
* Paginate data
*
* @param int $itemsPerPage Number of items per page
* @param int $pageNumber Current page number
*
* @return Zend_Paginator
*/
public function paginate($itemsPerPage = null, $pageNumber = null)
{
return $this->query->paginate($itemsPerPage, $pageNumber);
}
}