From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 11 Apr 2008 06:56:37 +0000 (+0000)
Subject: Updated workstation Generic
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6c90ab56011418c66befa6a34cde712906af06d9;p=gosa.git

Updated workstation Generic
-Updated currently installing Dialog. Now it is an 'OK' -> 'Abort' Dialog


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10341 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 894e24667..aa7059da1 100644
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
@@ -471,9 +471,15 @@ class workgeneric extends plugin
       }
     }else{
       /* Warn the user, that this host is currently installing */
-      if($this->currently_installing && !$this->currently_installing_warned && !preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->orig_dn)){
+      if($this->currently_installing && !$this->currently_installing_warned && 
+          !preg_match("/".normalizePreg(get_ou("incomingou"))."/",$this->orig_dn)){
+      
+        /* Force aborting without message dialog */
+        $message[] = "";
         $this->currently_installing_warned = TRUE;
-        $message[] = _("This host is currently installing, if you really want to save it, save again.");
+        msg_dialog::display(_("Software deployment"), 
+            _("This host is currently installing, if you really want to save it, press 'OK'."),
+            CONFIRM_DIALOG);
       }
     }