tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-31 01:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

DataView: Move sort() body to order() and remove sort() and fromRequest()

Browse Source
This commit is contained in:
Sukhwinder Dhillon 2022-05-02 15:38:33 +02:00 committed by Johannes Meyer
parent 58ac2a97c2
commit 577d97a450
1 changed files with 11 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,23 +123,6 @@ abstract class DataView implements QueryInterface, SortRules, FilterColumns, Ite
*/ */
abstract public function getColumns(); abstract public function getColumns();
/**
* Create view from request
*
* @param Request $request
* @param array $columns
*
* @return static
* @deprecated Use $backend->select()->from($viewName) instead
*/
public static function fromRequest($request, array $columns = null)
{
$view = new static(MonitoringBackend::instance($request->getParam('backend')), $columns);
$view->applyUrlFilter($request);
return $view;
}
protected function getHookedColumns() protected function getHookedColumns()
{ {
$columns = array(); $columns = array();
@ -200,7 +183,7 @@ abstract class DataView implements QueryInterface, SortRules, FilterColumns, Ite
} }
} }
$view->sort($params['sort'], $order); $view->order($params['sort'], $order);
} }
return $view; return $view;
} }
@ -324,18 +307,14 @@ abstract class DataView implements QueryInterface, SortRules, FilterColumns, Ite
} }
/** /**
* Sort the rows, according to the specified sort column and order * Sort result set either by the given column (and direction) or the sort defaults
* *
* @param string $column Sort column * @param string $column
* @param string $order Sort order, one of the SORT_ constants * @param string $direction
* *
* @return $this * @return $this
* @throws QueryException If the sort column is not allowed
* @see DataView::SORT_ASC
* @see DataView::SORT_DESC
* @deprecated Use DataView::order() instead
*/ */
public function sort($column = null, $order = null) public function order($column = null, $direction = null)
{ {
$sortRules = $this->getSortRules(); $sortRules = $this->getSortRules();
if ($column === null) { if ($column === null) {
@ -356,16 +335,16 @@ abstract class DataView implements QueryInterface, SortRules, FilterColumns, Ite
} else { } else {
$sortColumns = array( $sortColumns = array(
'columns' => array($column), 'columns' => array($column),
'order' => $order 'order' => $direction
); );
}; };
} }
$order = $order === null ? (isset($sortColumns['order']) ? $sortColumns['order'] : static::SORT_ASC) : $order; $direction = $direction === null ? ($sortColumns['order'] ?? static::SORT_ASC) : $direction;
$order = (strtoupper($order) === static::SORT_ASC) ? 'ASC' : 'DESC'; $direction = (strtoupper($direction) === static::SORT_ASC) ? 'ASC' : 'DESC';
foreach ($sortColumns['columns'] as $column) { foreach ($sortColumns['columns'] as $column) {
list($column, $direction) = $this->query->splitOrder($column); list($column, $order) = $this->query->splitOrder($column);
if (! $this->isValidFilterTarget($column)) { if (! $this->isValidFilterTarget($column)) {
throw new QueryException( throw new QueryException(
mt('monitoring', 'The sort column "%s" is not allowed in "%s".'), mt('monitoring', 'The sort column "%s" is not allowed in "%s".'),
@ -373,7 +352,7 @@ abstract class DataView implements QueryInterface, SortRules, FilterColumns, Ite
get_class($this) get_class($this)
); );
} }
$this->query->order($column, $direction !== null ? $direction : $order); $this->query->order($column, $order !== null ? $order : $direction);
} }
$this->isSorted = true; $this->isSorted = true;
return $this; return $this;
@ -389,19 +368,6 @@ abstract class DataView implements QueryInterface, SortRules, FilterColumns, Ite
return array(); return array();
} }
/**
* Sort result set either by the given column (and direction) or the sort defaults
*
* @param string $column
* @param string $direction
*
* @return $this
*/
public function order($column = null, $direction = null)
{
return $this->sort($column, $direction);
}
/** /**
* Whether an order is set * Whether an order is set
* *