tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-05-03 22:30:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

SortBox: Properly apply sort rules and show the user the default

Browse Source 
refs #6644
This commit is contained in:
Johannes Meyer 2015-07-28 12:03:50 +02:00
parent d56b31fe5e
commit f7b35b04f4
1 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
library/Icinga/Web/Widget/SortBox.php
View File

@ -3,10 +3,11 @@
namespace Icinga\Web\Widget; namespace Icinga\Web\Widget;
use Icinga\Application\Icinga;
use Icinga\Data\Sortable;
use Icinga\Data\SortRules;
use Icinga\Web\Form; use Icinga\Web\Form;
use Icinga\Web\Request; use Icinga\Web\Request;
use Icinga\Data\Sortable;
use Icinga\Application\Icinga;
/** /**
* SortBox widget * SortBox widget
@ -113,13 +114,41 @@ class SortBox extends AbstractWidget
if ($request === null) { if ($request === null) {
$request = Icinga::app()->getFrontController()->getRequest(); $request = Icinga::app()->getFrontController()->getRequest();
} }
if ($sort = $request->getParam('sort')) {
if (($sort = $request->getParam('sort'))) {
$this->query->order($sort, $request->getParam('dir')); $this->query->order($sort, $request->getParam('dir'));
} elseif (($dir = $request->getParam('dir'))) {
$this->query->order(null, $dir);
} }
} }
return $this; return $this;
} }
/**
* Return the default sort rule for the query
*
* @param string $column An optional column
*
* @return array An array of two values: $column, $direction
*/
protected function getSortDefaults($column = null)
{
$direction = null;
if ($this->query !== null && $this->query instanceof SortRules) {
$sortRules = $this->query->getSortRules();
if ($column === null) {
$column = key($sortRules);
}
if ($column !== null && isset($sortRules[$column]['order'])) {
$direction = strtoupper($sortRules[$column]['order']) === Sortable::SORT_DESC ? 'desc' : 'asc';
}
}
return array($column, $direction);
}
/** /**
* Render this SortBox as HTML * Render this SortBox as HTML
* *
@ -166,17 +195,29 @@ class SortBox extends AbstractWidget
) )
); );
$column = null;
if ($this->request) { if ($this->request) {
$url = $this->request->getUrl(); $url = $this->request->getUrl();
if ($url->hasParam('sort')) { if ($url->hasParam('sort')) {
$columnForm->populate(array('sort' => $url->getParam('sort'))); $column = $url->getParam('sort');
}
if ($url->hasParam('dir')) { if ($url->hasParam('dir')) {
$orderForm->populate(array('dir' => $url->getParam('dir'))); $direction = $url->getParam('dir');
} else {
list($_, $direction) = $this->getSortDefaults($column);
}
} elseif ($url->hasParam('dir')) {
$direction = $url->getParam('dir');
list($column, $_) = $this->getSortDefaults();
} }
} }
if ($column === null) {
list($column, $direction) = $this->getSortDefaults();
}
$columnForm->populate(array('sort' => $column));
$orderForm->populate(array('dir' => $direction));
return '<div class="sort-control">' . $columnForm . $orderForm . '</div>'; return '<div class="sort-control">' . $columnForm . $orderForm . '</div>';
} }
} }