Small bugfixes + extensions

elements-at · Feb 1, 2019 · 3d24d87 · 3d24d87 · ctippler · Feb 1, 2019
1 parent 59fef81
commit 3d24d87
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/Elements/Bundle/ProcessManagerBundle/Controller/IndexController.php b/src/Elements/Bundle/ProcessManagerBundle/Controller/IndexController.php
@@ -96,18 +96,20 @@ public function getPluginConfigAction(Request $request)
 
         $shortCutMenu = [];
 
-        $list = new Configuration\Listing();
-        $list->setUser($this->getAdminUser());
-        $list->setOrderKey('name');
-        foreach ($list->load() as $config) {
-            $group = $config->getGroup() ?: 'default';
-            $shortCutMenu[$group][] = [
-                'id' => $config->getId(),
-                'name' => $config->getName(),
-                'group' => $config->getGroup(),
-            ];
+        if(!$pluginConfig['general']['disableShortcutMenu']){
+            $list = new Configuration\Listing();
+            $list->setUser($this->getAdminUser());
+            $list->setOrderKey('name');
+            foreach ($list->load() as $config) {
+                $group = $config->getGroup() ?: 'default';
+                $shortCutMenu[$group][] = [
+                    'id' => $config->getId(),
+                    'name' => $config->getName(),
+                    'group' => $config->getGroup(),
+                ];
+            }
+            $data['shortCutMenu'] = $shortCutMenu ?: false;
         }
-        $data['shortCutMenu'] = $shortCutMenu ?: false;
 
         return $this->adminJson($data);
     }

diff --git a/src/Elements/Bundle/ProcessManagerBundle/install/plugin-process-manager.php b/src/Elements/Bundle/ProcessManagerBundle/install/plugin-process-manager.php
@@ -21,6 +21,7 @@
         'executeWithMaintenance' => true, //do execute with maintenance (deactivate if you set up a separate cronjob)
         'processTimeoutMinutes' => 15, //if no update of the monitoring item is done within this amount of minutes the process is considered as "hanging"
         //'additionalScriptExecutionUsers' => ['deployer', 'vagrant'] //additional system users which are allowed to execute the scripts
+        //'disableShortcutMenu' => true, //disables the shortcut menu on the left side in the admin interface
     ],
     'email' => [
         'recipients' => explode(';', (string)$systemConfig['applicationlog']['mail_notification']['mail_receiver']), //gets a reporting e-mail when a process is dead