Fixed objectgroup handling

[gosa.git] / plugins / admin / ogroups / tabs_ogroups.inc

diff --git a/plugins/admin/ogroups/tabs_ogroups.inc b/plugins/admin/ogroups/tabs_ogroups.inc
index 327b473e75c78e06a7ea677fb048cb1fe7d7ac6b..abccd5e532b8f5bb290cb46f2a9ec21fc2c985c9 100644 (file)
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -37,6 +37,16 @@ class ogrouptabs extends tabs
       unset($this->by_object['termgroup']);
       unset($this->by_name['termgroup']);
     }
+    
+    /* Remove ws tabs, if theres no ws left in the object list */
+    if((!preg_match("/W/",$objects))&&(isset($this->by_object['workstartup']))){
+      $this->by_object['workservice']->remove_from_parent();
+      unset($this->by_object['workservice']);
+      unset($this->by_name['workservice']);
+      $this->by_object['workstartup']->remove_from_parent();
+      unset($this->by_object['workstartup']);
+      unset($this->by_name['workstartup']);
+    }
   
     /* Create goPhoneAccount if theres an user with goPhoneAccount
      * but only if there is currently no queue enabled.
@@ -56,7 +66,7 @@ class ogrouptabs extends tabs
     }
 
     /* Add mail group tab , if there is curerntly no mail tab defined */ 
-    if((!preg_match("/U/",$objects))&&(!isset($this->by_object['mailogroup']))){
+    if((preg_match("/U/",$objects))&&(!isset($this->by_object['mailogroup']))){
       if(isset($this->config->current['MAILMETHOD'])){
         if (preg_match('/kolab/i', $this->config->current['MAILMETHOD'])){
           require_once("class_mailogroup.inc");
@@ -68,7 +78,7 @@ class ogrouptabs extends tabs
     }
 
     /* Add Terminal tab */
-    if((!preg_match("/T/",$objects))&&(!isset($this->by_object['termgroup']))){
+    if((preg_match("/T/",$objects))&&(!isset($this->by_object['termgroup']))){
       require_once("class_termgroup.inc");
       if(!isset($this->by_object['termgroup'])){
         $this->by_name['termgroup']= _("Terminals");
@@ -76,6 +86,20 @@ class ogrouptabs extends tabs
         $this->by_object['termgroup']->parent= &$this;
       }
     }
+    
+    /* Add Workstation tabs */
+    if((preg_match("/W/",$objects))&&(!isset($this->by_object['workstartup']))){
+      if(!isset($this->by_object['workstartup'])){
+        $this->by_name['workstartup']= _("Startup");
+        $this->by_object['workstartup']= new workstartup($this->config, $this->dn);
+        $this->by_object['workstartup']->acl = "#all#";
+        $this->by_object['workstartup']->parent= &$this;
+        $this->by_name['workservice']= _("Devices");
+        $this->by_object['workservice']= new workservice($this->config, $this->dn);
+        $this->by_object['workservice']->acl = "#all#";
+        $this->by_object['workservice']->parent= &$this;
+      }
+    }
   }
 
   function execute(){