Moved reinstall and update to the jobs

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8935 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
index 9a1b6d40175df37a4fa5e529f2b8c224d9349920..24b1b5ac3af818da8cdf33ef58b646f61cff06b5 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
@@ -167,7 +167,13 @@ class termgeneric extends plugin
     }
 
     if (isset($_POST['action']) && $this->acl_is_writeable("FAIstate") && isset($this->mapActions[$_POST['saction']])){
-           gosaSupportDaemon::send("gosa_trigger_action_".$_POST['saction'], $this->netConfigDNS->macAddress, array("macAddress" => $this->netConfigDNS->macAddress));
+        $method= "gosa";
+        $action= $_POST['saction'];
+        if ($action == "reinstall" || $action == "softupdate"){
+                $method= "job";
+        }
+        gosaSupportDaemon::send("${method}_trigger_action_".$action, $this->netConfigDNS->macAddress, array("macAddress" => $t
+his->netConfigDNS->macAddress));
     }
 
     /* Base select dialog */

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
index e201dd3dd8877e533c145e8904ed280bc6bf38a0..2595d495af74587ef6068769ab63f11b4b192962 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
@@ -182,9 +182,14 @@ class workgeneric extends plugin
     }
 
     if ((isset($_POST['action'])) && ($this->acl_is_writeable("FAIstate")) && isset($this->mapActions[$_POST['saction']]) ){
-       gosaSupportDaemon::send("gosa_trigger_action_".$_POST['saction'], $this->netConfigDNS->macAddress, array("macAddress" => $this->netConfigDNS->macAddress));
-
-        if ($_POST['saction'] != "wake") {
+       $method= "gosa";
+       $action= $_POST['saction'];
+       if ($action == "reinstall" || $action == "update"){
+               $method= "job";
+       }
+       gosaSupportDaemon::send("${method}_trigger_action_".$action, $this->netConfigDNS->macAddress, array("macAddress" => $this->netConfigDNS->macAddress));
+
+        if ($action != "wake") {
 
           /* Set FAIstate */
           if($this->fai_activated && $this->dn != "new"){