Preserve/Remove param `showCompact` instead of `view`

This commit is contained in:
Johannes Meyer 2020-06-03 15:59:06 +02:00
parent 6cf9f19048
commit a240e306ed
14 changed files with 14 additions and 14 deletions

View File

@ -235,7 +235,7 @@ class Controller extends ModuleActionController
'sort', // setupSortControl() 'sort', // setupSortControl()
'dir', // setupSortControl() 'dir', // setupSortControl()
'backend', // Framework 'backend', // Framework
'view', // Framework 'showCompact', // Framework
'_dev' // Framework '_dev' // Framework
); );

View File

@ -355,7 +355,7 @@ class ListController extends Controller
$this->view->form = $form; $this->view->form = $form;
$this->params $this->params
->remove('view') ->remove('showCompact')
->remove('format'); ->remove('format');
$orientation = $this->params->shift('vertical', 0) ? 'vertical' : 'horizontal'; $orientation = $this->params->shift('vertical', 0) ? 'vertical' : 'horizontal';
/* /*

View File

@ -35,7 +35,7 @@ class ServicesController extends Controller
$serviceList = new ServiceList($this->backend); $serviceList = new ServiceList($this->backend);
$this->applyRestriction('monitoring/filter/objects', $serviceList); $this->applyRestriction('monitoring/filter/objects', $serviceList);
$serviceList->addFilter(Filter::fromQueryString( $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 = $serviceList;
$this->serviceList->setColumns(array( $this->serviceList->setColumns(array(

View File

@ -43,7 +43,7 @@
<div class="action-links"> <div class="action-links">
<?= $this->qlink( <?= $this->qlink(
$this->translate('Show More'), $this->translate('Show More'),
$this->url()->without(array('view', 'limit')), $this->url()->without(array('showCompact', 'limit')),
null, null,
array( array(
'class' => 'action-link', 'class' => 'action-link',

View File

@ -71,7 +71,7 @@
<div class="action-links"> <div class="action-links">
<?= $this->qlink( <?= $this->qlink(
$this->translate('Show More'), $this->translate('Show More'),
$this->url()->without(array('view', 'limit')), $this->url()->without(array('showCompact', 'limit')),
null, null,
array( array(
'class' => 'action-link', 'class' => 'action-link',

View File

@ -46,7 +46,7 @@ if (! $this->compact): ?>
<div class="action-links"> <div class="action-links">
<?= $this->qlink( <?= $this->qlink(
$this->translate('Show More'), $this->translate('Show More'),
$this->url()->without(array('view', 'limit')), $this->url()->without(array('showCompact', 'limit')),
null, null,
array( array(
'class' => 'action-link', 'class' => 'action-link',

View File

@ -284,7 +284,7 @@ if (! $this->compact): ?>
<div class="action-links"> <div class="action-links">
<?= $this->qlink( <?= $this->qlink(
$this->translate('Show More'), $this->translate('Show More'),
$this->url()->without(array('view', 'limit')), $this->url()->without(array('showCompact', 'limit')),
null, null,
array( array(
'class' => 'action-link', 'class' => 'action-link',

View File

@ -102,7 +102,7 @@ if (! $this->compact): ?>
<div class="action-links"> <div class="action-links">
<?= $this->qlink( <?= $this->qlink(
$this->translate('Show More'), $this->translate('Show More'),
$this->url()->without(array('view', 'limit')), $this->url()->without(array('showCompact', 'limit')),
null, null,
array( array(
'class' => 'action-link', 'class' => 'action-link',

View File

@ -112,7 +112,7 @@ if (! $this->compact): ?>
<div class="action-links"> <div class="action-links">
<?= $this->qlink( <?= $this->qlink(
$this->translate('Show More'), $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, null,
array( array(
'class' => 'action-link', 'class' => 'action-link',

View File

@ -172,7 +172,7 @@ if (! $this->compact): ?>
<div class="action-links"> <div class="action-links">
<?= $this->qlink( <?= $this->qlink(
$this->translate('Show More'), $this->translate('Show More'),
$this->url()->without(array('view', 'limit')), $this->url()->without(array('showCompact', 'limit')),
null, null,
array( array(
'class' => 'action-link', 'class' => 'action-link',

View File

@ -130,7 +130,7 @@ if (! $this->compact): ?>
<div class="action-links"> <div class="action-links">
<?= $this->qlink( <?= $this->qlink(
$this->translate('Show More'), $this->translate('Show More'),
$this->url()->without(array('view', 'limit')), $this->url()->without(array('showCompact', 'limit')),
null, null,
array( array(
'class' => 'action-link', 'class' => 'action-link',

View File

@ -247,7 +247,7 @@ $rowAction = Url::fromPath('monitoring/event/show');
<?php if ($this->compact) { <?php if ($this->compact) {
echo $this->qlink( echo $this->qlink(
$this->translate('Show More'), $this->translate('Show More'),
$url->without(array('view', 'limit')), $url->without(array('showCompact', 'limit')),
null, null,
array( array(
'class' => 'action-link', 'class' => 'action-link',

View File

@ -4,7 +4,7 @@ if ($dataView->hasMore()): ?>
<div class="text-right"> <div class="text-right">
<?= $this->qlink( <?= $this->qlink(
$this->translate('Show More'), $this->translate('Show More'),
$this->url()->without(array('view', 'limit')), $this->url()->without(array('showCompact', 'limit')),
null, null,
array( array(
'data-base-target' => '_next', 'data-base-target' => '_next',

View File

@ -147,7 +147,7 @@ abstract class DataView implements QueryInterface, SortRules, FilterColumns, Ite
$dir = $url->shift('dir'); $dir = $url->shift('dir');
$page = $url->shift('page'); $page = $url->shift('page');
$format = $url->shift('format'); $format = $url->shift('format');
$view = $url->shift('view'); $view = $url->shift('showCompact');
$view = $url->shift('backend'); $view = $url->shift('backend');
foreach ($url->getParams() as $k => $v) { foreach ($url->getParams() as $k => $v) {
$this->where($k, $v); $this->where($k, $v);