From: cajus Date: Wed, 9 Apr 2008 13:00:55 +0000 (+0000) Subject: Updated workstation generic X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f2e074335a1891b88c23f4c252897e727e691ed2;p=gosa.git Updated workstation generic -Do not send warning about installation if host is from incoming git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10302 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc index fb8347ddd..67f82aa26 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc @@ -466,12 +466,12 @@ class workgeneric extends plugin } }else{ /* Warn the user, that this host is currently installing */ - if($this->currently_installing && !$this->currently_installing_warned){ + if($this->currently_installing && !$this->currently_installing_warned && !preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->orig_dn)){ $this->currently_installing_warned = TRUE; $message[] = _("This host is currently installing, if you really want to save it, save again."); } } - + return ($message); }