Backport to V3: Add user permission to control access for testGrafana…

…Connection method
it-novum · Feb 26, 2020 · 50722be · 50722be
1 parent 581cc90
commit 50722be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/app/Plugin/GrafanaModule/Config/acl_dependencies.php b/app/Plugin/GrafanaModule/Config/acl_dependencies.php
@@ -40,7 +40,7 @@
         ],
         'dependencies'   => [
             'GrafanaConfiguration'  => [
-                'index' => ['testGrafanaConnection', 'loadHostgroups'],
+                'index' => ['loadHostgroups'],
             ],
             'GrafanaUserdashboards' => [
                 'add'    => ['loadContainers'],

diff --git a/app/Plugin/GrafanaModule/View/GrafanaConfiguration/index.ctp b/app/Plugin/GrafanaModule/View/GrafanaConfiguration/index.ctp
@@ -188,11 +188,13 @@
                     <div class="col-xs-12 margin-top-10">
                         <div class="well formactions ">
                             <div class="pull-right">
-                                <button type="button"
-                                        class="btn text-center btn-primary"
-                                        ng-click="checkGrafanaConnection()">
-                                    <?php echo __('Check Grafana Connection'); ?>
-                                </button>
+                                <?php if ($this->Acl->hasPermission('testGrafanaConnection', 'GrafanaConfiguration', 'GrafanaModule')): ?>
+                                    <button type="button"
+                                            class="btn text-center btn-primary"
+                                            ng-click="checkGrafanaConnection()">
+                                        <?php echo __('Check Grafana Connection'); ?>
+                                    </button>
+                                <?php endif; ?>
                                 <input class="btn btn-primary" type="submit" value="Save">&nbsp;
                             </div>
                         </div>