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

Revert "Don't show the link for resource removal if the resource is utilized for configuration"

Browse Source 
This reverts commit 7331904851ec6bbb5d32a40ead3bfed632f10d1e.
This commit is contained in:
Alexander A. Klimov 2016-11-03 18:28:44 +01:00 committed by Johannes Meyer
parent 7331904851
commit 252ce5d60d
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/ConfigController.php
View File

@ -315,8 +315,6 @@ class ConfigController extends Controller
{ {
$this->assertPermission('config/application/resources'); $this->assertPermission('config/application/resources');
$this->view->resources = Config::app('resources', true); $this->view->resources = Config::app('resources', true);
$configResource = Config::app()->get('global', 'config_resource');
$this->view->unremovableResources = $configResource === null ? array() : array($configResource);
$this->createApplicationTabs()->activate('resource'); $this->createApplicationTabs()->activate('resource');
} }

8
application/views/scripts/config/resource.phtml
View File

@ -58,9 +58,7 @@
) ?> ) ?>
</td> </td>
<td class="icon-col text-right"> <td class="icon-col text-right">
<?php <?= $this->qlink(
if (! in_array($name, $unremovableResources)) {
echo $this->qlink(
'', '',
'config/removeresource', 'config/removeresource',
array('resource' => $name), array('resource' => $name),
@ -69,9 +67,7 @@
'icon' => 'cancel', 'icon' => 'cancel',
'title' => sprintf($this->translate('Remove resource %s'), $name) 'title' => sprintf($this->translate('Remove resource %s'), $name)
) )
); ) ?>
}
?>
</td> </td>
</tr> </tr>
<?php endforeach ?> <?php endforeach ?>