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

Filter: support 'q' searches 

This makes the overall search play nice with the FilterEditor and
reduces code in the action controller. Still some work to do, but
seems to be pretty fine right now.
This commit is contained in:
Thomas Gelf 2014-11-16 02:40:28 +01:00
parent 87c8e58dab
commit 387928de02
2 changed files with 81 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
library/Icinga/Web/Widget/FilterEditor.php
View File

@ -108,6 +108,34 @@ class FilterEditor extends AbstractWidget
$response->redirectAndExit($url);
}
protected function mergeRootExpression($filter, $column, $sign, $expression)
{
$found = false;
if ($filter->isChain() && $filter->getOperatorName() === 'AND') {
foreach ($filter->filters() as $f) {
if ($f->isExpression()
&& $f->getColumn() === $column
&& $f->getSign() === $sign
) {
$f->setExpression($expression);
$found = true;
break;
}
}
} elseif ($filter->isExpression()) {
if ($filter->getColumn() === $column && $filter->getSign() === $sign) {
$filter->setExpression($expression);
$found = true;
}
}
if (! $found) {
$filter = $filter->andFilter(
Filter::expression($column, $sign, $expression)
);
}
return $filter;
}
public function handleRequest($request)
{
$this->setUrl($request->getUrl()->without($this->ignoreParams));
@ -124,7 +152,59 @@ class FilterEditor extends AbstractWidget
$remove = $params->shift('removeFilter');
$strip = $params->shift('stripFilter');
$modify = $params->shift('modifyFilter');
$filter = $this->getFilter();
$search = null;
if ($request->isPost()) {
$search = $request->getPost('q');
}
if ($search === null) {
$search = $params->shift('q');
}
$filter = $this->getFilter();
if ($search !== null) {
if (strpos($search, '=') === false) {
// TODO: Ask the view for (multiple) search columns
switch($request->getActionName()) {
case 'services':
$searchCol = 'service_description';
break;
case 'hosts':
$searchCol = 'host_name';
break;
case 'hostgroups':
$searchCol = 'hostgroup';
break;
case 'servicegroups':
$searchCol = 'servicegroup';
break;
default:
$searchCol = null;
}
if ($searchCol === null) {
throw new Exception('Cannot search here');
}
$filter = $this->mergeRootExpression($filter, $searchCol, '=', "*$search*");
} else {
list($k, $v) = preg_split('/=/', $search);
$filter = $this->mergeRootExpression($filter, $k, '=', $v);
}
$url = $this->url()->setQueryString(
$filter->toQueryString()
)->addParams($preserve);
if ($modify) {
$url->getParams()->add('modifyFilter');
}
$this->redirectNow($url);
}
if ($remove) {
$redirect = $this->url();

27
modules/monitoring/application/controllers/ListController.php
View File

@ -46,7 +46,6 @@ class Monitoring_ListController extends Controller
$url = clone($this->url);
if ($this->getRequest()->isPost()) {
if ($request->getPost('sort')) {
$url->setParam('sort', $request->getPost('sort'));
if ($request->getPost('dir')) {
@ -56,32 +55,6 @@ class Monitoring_ListController extends Controller
}
return $url;
}
$q = $this->getRequest()->getPost('q');
if ($q) {
list($k, $v) = preg_split('/=/', $q);
$url->addParams(array($k => $v));
return $url;
}
} else {
$q = $url->shift('q');
if ($q !== null) {
$action = $this->_request->getActionName();
switch($action) {
case 'services':
$this->params->remove('q')->set('service_description', '*' . $q . '*');
break;
case 'hosts':
$this->params->remove('q')->set('host_name', '*' . $q . '*');
break;
case 'hostgroups':
$this->params->remove('q')->set('hostgroup', '*' . $q . '*');
break;
case 'servicegroups':
$this->params->remove('q')->set('servicegroup', '*' . $q . '*');
break;
}
}
}
return false;
}