X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Ftabs_workstation.inc;h=0fe5667ea5a861556fbdda8f23f5b3a054cef8d0;hb=269b6da4461630896e0af284cca9742b9f819f2b;hp=edfda8e02ad6721e600376c39daba2a4d7b8dda6;hpb=bcd990bd4ee1bbd8abfd2093f0879e8afdd8ca0b;p=gosa.git

diff --git a/plugins/admin/systems/tabs_workstation.inc b/plugins/admin/systems/tabs_workstation.inc
index edfda8e02..0fe5667ea 100644
--- a/plugins/admin/systems/tabs_workstation.inc
+++ b/plugins/admin/systems/tabs_workstation.inc
@@ -5,20 +5,26 @@ class worktabs extends tabs
 
   function worktabs($config, $data, $dn,$category)
   {
+    
     /* Save dn */
     $this->dn= $dn;
     $this->config= $config;
 
+    $baseobject= NULL;
+
     foreach ($data as $tab){
-      if($tab['CLASS'] == "printgeneric"){
-        $this->by_name[$tab['CLASS']]= $tab['NAME'];
-        $this->by_object[$tab['CLASS']]= new $tab['CLASS']($this->config, $this->dn,$category);
-        $this->by_object[$tab['CLASS']]->parent= &$this;
-      }else{
-        $this->by_name[$tab['CLASS']]= $tab['NAME'];
-        $this->by_object[$tab['CLASS']]= new $tab['CLASS']($this->config, $this->dn,$category);
-        $this->by_object[$tab['CLASS']]->parent= &$this;
+      $this->by_name[$tab['CLASS']]= $tab['NAME'];
+
+      if ($baseobject == NULL){
+        $baseobject= new $tab['CLASS']($this->config, $this->dn,NULL,$this);
+        $this->by_object[$tab['CLASS']]= $baseobject;
+      } else {
+        $this->by_object[$tab['CLASS']]= new $tab['CLASS']($this->config, $this->dn, $baseobject,$this);
       }
+
+      $this->by_object[$tab['CLASS']]->parent= &$this;
+      $this->by_object[$tab['CLASS']]->set_acl_category($category);
+
       /* Initialize current */
       if ($this->current == ""){
         $this->current= $tab['CLASS'];
@@ -32,6 +38,12 @@ class worktabs extends tabs
   function save_object($save_current= FALSE)
   {
     tabs::save_object($save_current);
+
+    /* Assign current cn */
+    $baseobject= $this->by_object['workgeneric'];
+    foreach ($this->by_object as $key => $obj){
+      $this->by_object[$key]->cn= $baseobject->cn;
+    }
   }
 
 
@@ -50,8 +62,10 @@ class worktabs extends tabs
 
     tabs::save(TRUE);
 
-    if(($this->by_object['printgeneric']->is_account==false)&&($this->by_object['printgeneric']->initially_was_account==true)){
-      $this->by_object['printgeneric']->remove_from_parent();
+    if(isset($this->by_object['printgeneric'])){
+      if(($this->by_object['printgeneric']->is_account==false)&&($this->by_object['printgeneric']->initially_was_account==true)){
+        $this->by_object['printgeneric']->remove_from_parent();
+      }
     }
 
     /* Fix tagging if needed */