Replace {t}Delete{/t} with {msgPool type=delButton}

[gosa.git] / gosa-plugins / systems / admin / systems / class_systemManagement.inc

diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index e5d66afcc17849ebad7e1ac8affb9f53a8291da9..b1f33c1b94cc54845aaa48774812e569175d0b45 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_systemManagement.inc
+++ b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
@@ -898,11 +898,11 @@ class systems extends plugin
 
           /* Add installation event
            */
-          if(!empty($mac) && isset($events['BY_CLASS']['DaemonEvent_install'])){
-            $evt = $events['BY_CLASS']['DaemonEvent_install'];
+          if(!empty($mac) && isset($events['BY_CLASS']['DaemonEvent_reinstall'])){
+            $evt = $events['BY_CLASS']['DaemonEvent_reinstall'];
             $tmp = new $evt['CLASS_NAME']($this->config);
             $tmp->add_targets(array($mac));
-            $tmp->set_type(TRIGGERED_EVENT);
+            $tmp->set_type(SCHEDULED_EVENT);
             $o_queue = new gosaSupportDaemon();
             $o_queue->append($tmp);
             if($o_queue->is_error()){
@@ -939,7 +939,7 @@ class systems extends plugin
       } else {
         /* Ok. There seem to be errors regarding to the tab data,
            show message and continue as usual. */
-        show_errors($message);
+        msgDialog::displayChecks($message);
       }
     }
 
@@ -974,6 +974,7 @@ class systems extends plugin
 
       $dialog     = FALSE;
       $hide_apply = $this->dn == "new";
+      $hide_apply = ($this->dn == "new") || (preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->dn));
       if(is_object($this->systab) && !isset($this->systab->by_object)){
         $dialog = TRUE;
         $hide_apply = TRUE;