tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This reverts commit 7331904851.
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->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');
}

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

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