tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

NavigationController: Add new parameters to all view script's links

Browse Source 
refs #10246
This commit is contained in:
Johannes Meyer 2015-09-29 17:15:57 +02:00
parent 4b76115399
commit 1c44a3306b
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/NavigationController.php
View File

@ -182,7 +182,6 @@ class NavigationController extends Controller
$removeForm = new Form(); $removeForm = new Form();
$removeForm->setUidDisabled(); $removeForm->setUidDisabled();
$removeForm->setAction(Url::fromPath('navigation/unshare'));
$removeForm->addElement('hidden', 'name', array( $removeForm->addElement('hidden', 'name', array(
'decorators' => array('ViewHelper') 'decorators' => array('ViewHelper')
)); ));

10
application/views/scripts/navigation/index.phtml
View File

@ -27,7 +27,10 @@
<td><?= $this->qlink( <td><?= $this->qlink(
$name, $name,
'navigation/edit', 'navigation/edit',
array('name' => $name), array(
'name' => $name,
'type' => $item->type
),
array( array(
'title' => sprintf($this->translate('Edit navigation item %s'), $name) 'title' => sprintf($this->translate('Edit navigation item %s'), $name)
) )
@ -39,7 +42,10 @@
<td><?= $this->qlink( <td><?= $this->qlink(
'', '',
'navigation/remove', 'navigation/remove',
array('name' => $name), array(
'name' => $name,
'type' => $item->type
),
array( array(
'icon' => 'trash', 'icon' => 'trash',
'title' => sprintf($this->translate('Remove navigation item %s'), $name) 'title' => sprintf($this->translate('Remove navigation item %s'), $name)

15
application/views/scripts/navigation/shared.phtml
View File

@ -1,4 +1,8 @@
<?php if (! $this->compact): ?> <?php
use Icinga\Web\Url;
if (! $this->compact): ?>
<div class="controls"> <div class="controls">
<?= $this->tabs; ?> <?= $this->tabs; ?>
<?= $this->sortBox; ?> <?= $this->sortBox; ?>
@ -26,6 +30,8 @@
'navigation/edit', 'navigation/edit',
array( array(
'name' => $name, 'name' => $name,
'type' => $item->type,
'owner' => $item->owner,
'referrer' => 'shared' 'referrer' => 'shared'
), ),
array( array(
@ -48,7 +54,12 @@
) )
); ?></td> ); ?></td>
<?php else: ?> <?php else: ?>
<td data-base-target="_self"><?= $removeForm->setDefault('name', $name); ?></td> <td data-base-target="_self"><?= $removeForm
->setDefault('name', $name)
->setAction(Url::fromPath(
'navigation/unshare',
array('type' => $item->type, 'owner' => $item->owner)
)); ?></td>
<?php endif ?> <?php endif ?>
</tr> </tr>
<?php endforeach ?> <?php endforeach ?>