Preserve/Remove param `showCompact` instead of `view`
This commit is contained in:
Johannes Meyer
parent
6cf9f19048
commit
a240e306ed
|
|
@ -235,7 +235,7 @@ class Controller extends ModuleActionController
|
|||
'sort', // setupSortControl()
|
||||
'dir', // setupSortControl()
|
||||
'backend', // Framework
|
||||
'view', // Framework
|
||||
'showCompact', // Framework
|
||||
'_dev' // Framework
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -355,7 +355,7 @@ class ListController extends Controller
|
|||
$this->view->form = $form;
|
||||
|
||||
$this->params
|
||||
->remove('view')
|
||||
->remove('showCompact')
|
||||
->remove('format');
|
||||
$orientation = $this->params->shift('vertical', 0) ? 'vertical' : 'horizontal';
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ class ServicesController extends Controller
|
|||
$serviceList = new ServiceList($this->backend);
|
||||
$this->applyRestriction('monitoring/filter/objects', $serviceList);
|
||||
$serviceList->addFilter(Filter::fromQueryString(
|
||||
(string) $this->params->without(array('service_problem', 'service_handled', 'view'))
|
||||
(string) $this->params->without(array('service_problem', 'service_handled', 'showCompact'))
|
||||
));
|
||||
$this->serviceList = $serviceList;
|
||||
$this->serviceList->setColumns(array(
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
<div class="action-links">
|
||||
<?= $this->qlink(
|
||||
$this->translate('Show More'),
|
||||
$this->url()->without(array('view', 'limit')),
|
||||
$this->url()->without(array('showCompact', 'limit')),
|
||||
null,
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@
|
|||
<div class="action-links">
|
||||
<?= $this->qlink(
|
||||
$this->translate('Show More'),
|
||||
$this->url()->without(array('view', 'limit')),
|
||||
$this->url()->without(array('showCompact', 'limit')),
|
||||
null,
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ if (! $this->compact): ?>
|
|||
<div class="action-links">
|
||||
<?= $this->qlink(
|
||||
$this->translate('Show More'),
|
||||
$this->url()->without(array('view', 'limit')),
|
||||
$this->url()->without(array('showCompact', 'limit')),
|
||||
null,
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
|
|
|
|||
|
|
@ -284,7 +284,7 @@ if (! $this->compact): ?>
|
|||
<div class="action-links">
|
||||
<?= $this->qlink(
|
||||
$this->translate('Show More'),
|
||||
$this->url()->without(array('view', 'limit')),
|
||||
$this->url()->without(array('showCompact', 'limit')),
|
||||
null,
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ if (! $this->compact): ?>
|
|||
<div class="action-links">
|
||||
<?= $this->qlink(
|
||||
$this->translate('Show More'),
|
||||
$this->url()->without(array('view', 'limit')),
|
||||
$this->url()->without(array('showCompact', 'limit')),
|
||||
null,
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ if (! $this->compact): ?>
|
|||
<div class="action-links">
|
||||
<?= $this->qlink(
|
||||
$this->translate('Show More'),
|
||||
$this->url(isset($notificationsUrl) ? $notificationsUrl : null)->without(array('view', 'limit')),
|
||||
$this->url(isset($notificationsUrl) ? $notificationsUrl : null)->without(array('showCompact', 'limit')),
|
||||
null,
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ if (! $this->compact): ?>
|
|||
<div class="action-links">
|
||||
<?= $this->qlink(
|
||||
$this->translate('Show More'),
|
||||
$this->url()->without(array('view', 'limit')),
|
||||
$this->url()->without(array('showCompact', 'limit')),
|
||||
null,
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ if (! $this->compact): ?>
|
|||
<div class="action-links">
|
||||
<?= $this->qlink(
|
||||
$this->translate('Show More'),
|
||||
$this->url()->without(array('view', 'limit')),
|
||||
$this->url()->without(array('showCompact', 'limit')),
|
||||
null,
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
|
|
|
|||
|
|
@ -247,7 +247,7 @@ $rowAction = Url::fromPath('monitoring/event/show');
|
|||
<?php if ($this->compact) {
|
||||
echo $this->qlink(
|
||||
$this->translate('Show More'),
|
||||
$url->without(array('view', 'limit')),
|
||||
$url->without(array('showCompact', 'limit')),
|
||||
null,
|
||||
array(
|
||||
'class' => 'action-link',
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ if ($dataView->hasMore()): ?>
|
|||
<div class="text-right">
|
||||
<?= $this->qlink(
|
||||
$this->translate('Show More'),
|
||||
$this->url()->without(array('view', 'limit')),
|
||||
$this->url()->without(array('showCompact', 'limit')),
|
||||
null,
|
||||
array(
|
||||
'data-base-target' => '_next',
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ abstract class DataView implements QueryInterface, SortRules, FilterColumns, Ite
|
|||
$dir = $url->shift('dir');
|
||||
$page = $url->shift('page');
|
||||
$format = $url->shift('format');
|
||||
$view = $url->shift('view');
|
||||
$view = $url->shift('showCompact');
|
||||
$view = $url->shift('backend');
|
||||
foreach ($url->getParams() as $k => $v) {
|
||||
$this->where($k, $v);
|
||||
|
|
|
|||
Loading…
Reference in New Issue