Merge branch '5949-systems-dashboard-crash-on-1-4-dev' into '1.4-dev'

Resolve "Systems dashboard crash on 1.4-dev"

See merge request fusiondirectory/fd-plugins!531

systems/addons/dashboard/class_dashBoardSystems.inc

@@ -146,7 +146,7 @@ class dashboardSystems extends simplePlugin
       foreach (['cn','ipHostNumber','argonautProtocol','argonautPort'] as $key) {
         $argonaut_server[$key] = $attrs[$key][0];
       }
-      $argonaut_server['link'] = objects::link(key($argonaut_servers), 'server', 'service_serviceArgonaut', $attrs);
+      $argonaut_server['link'] = objects::link(key($argonaut_servers), 'server', 'service_argonautServer', $attrs);
     }
 
     if (strpos($ui->get_permissions($config->current['BASE'], 'server/argonautClient', ''), 'r') === FALSE) {

systems/admin/systems/services/class_servicesManagement.inc

@@ -70,6 +70,7 @@ class servicesManagement extends management implements SimpleTab
       'plIcon'        => '',
       'plObjectType'  => ['server'],
       'plPrority'     => 5,
+      'plSubTabs'     => 'SERVERSERVICE',
 
       'plProvidedAcls'  => []
     ];
@@ -263,6 +264,9 @@ class servicesManagement extends management implements SimpleTab
   function editEntry (array $action)
   {
     $s_entry = array_pop($action['targets']);
+    if (!isset($this->plugins[$s_entry])) {
+      throw new FusionDirectoryException('No service "'.$s_entry.'" in '.json_encode(array_keys($this->plugins)));
+    }
     if ($this->plugins[$s_entry]->acl_is_readable('')) {
       $this->backup       = get_object_vars($this->plugins[$s_entry]);
       $this->dialogObject = $this->plugins[$s_entry];