Support filter editing in event history
Add a FilterEditor to the eventhistory view, fix CSS layout resolves #6979
This commit is contained in:
parent
268dc7e4b1
commit
a4f4c8d27f
|
@ -541,7 +541,7 @@ class Monitoring_ListController extends Controller
|
|||
$form->handleRequest($this->getRequest());
|
||||
$this->view->form = $form;
|
||||
|
||||
if ($this->getRequest()->isPost()) {
|
||||
if ($this->getRequest()->isPost() && !$this->getParam('modifyFilter')) {
|
||||
// update filter string
|
||||
$filters = $form->getFilter();
|
||||
$url = $this->_request->getUrl();
|
||||
|
|
|
@ -5,11 +5,15 @@
|
|||
<?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
|
||||
</div>
|
||||
|
||||
<?= $form ?>
|
||||
<br/>
|
||||
<?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>
|
||||
<?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
|
||||
</div>
|
||||
|
||||
<br> <br>
|
||||
<?= $form ?>
|
||||
|
||||
<div class="content">
|
||||
<?= $this->filterEditor ?>
|
||||
</div>
|
||||
<?php endif ?>
|
||||
|
||||
<div class="content">
|
||||
|
|
|
@ -158,3 +158,19 @@ table.avp .customvar ul {
|
|||
div.selection-info {
|
||||
padding-top:1em;
|
||||
}
|
||||
|
||||
.optionbox {
|
||||
margin-left: 0em;
|
||||
margin-right: 3em;
|
||||
}
|
||||
|
||||
.optionbox label {
|
||||
max-width: 6.5em;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
margin-right: 0em;
|
||||
}
|
||||
|
||||
.optionbox input {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
|
|
@ -195,19 +195,3 @@ textarea {
|
|||
input, select, textarea {
|
||||
display: inline;
|
||||
}
|
||||
|
||||
.optionbox {
|
||||
margin-left: 0em;
|
||||
margin-right: 3em;
|
||||
}
|
||||
|
||||
.optionbox label {
|
||||
max-width: 6.5em;
|
||||
text-align: left;
|
||||
vertical-align: middle;
|
||||
margin-right: 0em;
|
||||
}
|
||||
|
||||
.optionbox input {
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue