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 7bab9be66701c0a9e22012fc6c363714ac0a71b9..abccd5e532b8f5bb290cb46f2a9ec21fc2c985c9 100644 (file)
--- a/plugins/admin/ogroups/tabs_ogroups.inc
+++ b/plugins/admin/ogroups/tabs_ogroups.inc
@@ -40,12 +40,12 @@ class ogrouptabs extends tabs
     
     /* 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['workstartup']->remove_from_parent();
-      unset($this->by_object['workstartup']);
-      unset($this->by_name['workstartup']);
-//      $this->by_object['workservice']->remove_from_parent();
+      $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
@@ -94,7 +94,7 @@ class ogrouptabs extends tabs
         $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']= _("Service");
+        $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;