tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 06:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

RepositoryQuery: Update sort order when converting sort rules in fetchAll

Browse Source
This commit is contained in:
Johannes Meyer 2015-06-26 15:13:31 +02:00
parent 0bcf7907d4
commit 0fc8e6046c
1 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
library/Icinga/Repository/RepositoryQuery.php
View File

@ -509,7 +509,9 @@ class RepositoryQuery implements QueryInterface, Iterator
$results = $this->query->fetchAll(); $results = $this->query->fetchAll();
if (! empty($results) && $this->repository->providesValueConversion($this->target)) { if (! empty($results) && $this->repository->providesValueConversion($this->target)) {
$updateOrder = false;
$columns = $this->getColumns(); $columns = $this->getColumns();
$flippedColumns = array_flip($columns);
foreach ($results as $row) { foreach ($results as $row) {
foreach ($columns as $alias => $column) { foreach ($columns as $alias => $column) {
if (! is_string($alias)) { if (! is_string($alias)) {
@ -518,6 +520,27 @@ class RepositoryQuery implements QueryInterface, Iterator
$row->$alias = $this->repository->retrieveColumn($this->target, $alias, $row->$alias); $row->$alias = $this->repository->retrieveColumn($this->target, $alias, $row->$alias);
} }
foreach (($this->getOrder() ?: array()) as $rule) {
if (! array_key_exists($rule[0], $flippedColumns) && property_exists($row, $rule[0])) {
if ($this->repository->providesValueConversion($this->target, $rule[0])) {
$updateOrder = true;
$row->{$rule[0]} = $this->repository->retrieveColumn(
$this->target,
$rule[0],
$row->{$rule[0]}
);
}
} elseif (array_key_exists($rule[0], $flippedColumns)) {
if ($this->repository->providesValueConversion($this->target, $rule[0])) {
$updateOrder = true;
}
}
}
}
if ($updateOrder) {
uasort($results, array($this->query, 'compare'));
} }
} }