Fixed tab check && printer initialisation

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

diff --git a/plugins/admin/systems/class_printGeneric.inc b/plugins/admin/systems/class_printGeneric.inc
index 4fb90cd28898526e1cafb5e37e3ae51b52a43e95..b38825df345393e46dc97c807b443f67d8d114a6 100644 (file)
--- a/plugins/admin/systems/class_printGeneric.inc
+++ b/plugins/admin/systems/class_printGeneric.inc
@@ -68,7 +68,7 @@ class printgeneric extends plugin
       $this->dn= preg_replace("/ou=terminals,/","ou=printers,",$this->dn);
     }
 
-    if($this->BelongsTo == "Workstation"){
+    if($this->BelongsTo == "Workstation" || $this->BelongsTo == "WorkstationTemplate"){
       $this->dn= preg_replace("/ou=workstations,/","ou=printers,",$this->dn);
     }
 

diff --git a/plugins/admin/systems/tabs_workstation.inc b/plugins/admin/systems/tabs_workstation.inc
index 7dcafd2c829c9da6c4f61d86e06adb745b1a540b..8716247cde1e19950bd508f84a8c1801a5e176de 100644 (file)
--- a/plugins/admin/systems/tabs_workstation.inc
+++ b/plugins/admin/systems/tabs_workstation.inc
@@ -31,7 +31,7 @@ class worktabs extends tabs
     tabs::save_object($save_current);
 
     /* Assign current cn to all other plugins */
-    $baseobject= $this->by_object['termgeneric'];
+    $baseobject= $this->by_object['workgeneric'];
     foreach ($this->by_object as $key => $obj){
       $this->by_object[$key]->dn= $this->dn;
       $this->by_object[$key]->cn= $baseobject->cn;