diff --git a/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc b/gosa-core/plugins/admin/ogroups/tabs_ogroups.inc
index adcc709f596173e9fb467ad8a2b1594dd30d87bb..6c327ae34fa536a23ae00f013ffe8aa35d99fdea 100644 (file)
unset($this->by_object['termgroup']);
unset($this->by_name['termgroup']);
}
- if(((!preg_match("/T/",$objects)) && (!preg_match("/W/",$objects)))&&(isset($this->by_object['termservice']))){
+ if(!preg_match("/T/",$objects) &&(isset($this->by_object['termservice']))){
$this->by_object['termservice']->remove_from_parent();
unset($this->by_object['termservice']);
unset($this->by_name['termservice']);
$this->by_object['termgroup']->inheritTimeServer = false;
$this->by_object['termgroup']->parent= &$this;
}
+ }
+ if(preg_match("/T/",$objects) &&(!isset($this->by_object['termservice']))){
if(!isset($this->by_object['termservice'])){
- $this->by_name['termservice']= _("Service");
- $this->by_object['termservice']= new termservice($this->config, $this->dn);
- $this->by_object['termservice']->parent= &$this;
+ $this->by_name['termservice']= _("Devices");
+ $this->by_object['termservice']= new termservice($this->config, $this->dn,$this->by_object['ogroup']);
}
}
-
+
/* Add Workstation tabs */
if((preg_match("/W/",$objects))&&(!isset($this->by_object['workservice']))){
$this->by_name['workservice']= _("Devices");
$this->by_object['termgroup']= new termgroup($this->config, $this->dn);
$this->by_object['termgroup']->parent= &$this;
- $this->by_name['termservice']= _("Service");
- $this->by_object['termservice']= new termservice($this->config, $this->dn);
- $this->by_object['termservice']->parent= &$this;
+ $this->by_name['termservice']= _("Devices");
+ $this->by_object['termservice']= new termservice($this->config, $this->dn,$this->by_object['ogroup']);
break;
case "U":