From 930e06376e6f48623fbe5e73ed1894db5c4d04f5 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 9 Feb 2006 08:54:49 +0000 Subject: [PATCH] Some changes for incoming handling / printer tab was is_account=true erverytime git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2647 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/systems/class_printGeneric.inc | 2 +- plugins/admin/systems/class_systemManagement.inc | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc index 9fe834993..69c065006 100644 --- a/plugins/admin/systems/class_printGeneric.inc +++ b/plugins/admin/systems/class_printGeneric.inc @@ -166,7 +166,7 @@ class printgeneric extends plugin * If there was a new single printer created, it was never saved. * -This allows new printers to be saved. */ - if($this->dn == "new"){ + if(($this->dn == "new")&&(!$this->is_terminal)){ $this->is_account = true; } } diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc index 7471c95d7..59b8ffdc2 100644 --- a/plugins/admin/systems/class_systemManagement.inc +++ b/plugins/admin/systems/class_systemManagement.inc @@ -916,6 +916,8 @@ class systems extends plugin "S" => array("select_server.png",_("Server")), "W" => array("select_winstation.png",_("Winstation")), "C" => array("select_component.png",_("Network Device")), + "NT"=> array("select_new_terminal.png",_("New Terminal")), + "NL"=> array("select_new_workstation.png",_("New Workstation")), "P" => array("select_printer.png",_("Printer"))); if((isset($input['is_new']))&&(!empty($input['is_new']))){ @@ -1135,7 +1137,11 @@ class systems extends plugin $tmp= $value["dn"]; } if (preg_match ("/,ou=incoming,/i", $tmp)){ - if (in_array('GOhard', $value['objectClass'])){ + if (in_array('gotoTerminal', $value['objectClass'])){ + $add= "- "._("New terminal"); + }elseif (in_array('gotoWorkstation', $value['objectClass'])){ + $add= "- "._("New workstation"); + }elseif (in_array('GOhard', $value['objectClass'])){ $add= "- "._("New Device"); } } else { -- 2.30.2