New schema fixes

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

diff --git a/plugins/admin/systems/class_workstationService.inc b/plugins/admin/systems/class_workstationService.inc
index ffbb2cbce859f11c220dcc23a1fff68b0f4c30dc..41ae7b4e6640740e34daa04f3ed5cf01c49b7181 100644 (file)
--- a/plugins/admin/systems/class_workstationService.inc
+++ b/plugins/admin/systems/class_workstationService.inc
@@ -62,7 +62,6 @@ class workservice extends plugin
       "gotoXMouseType", "gotoXMouseport", "goFonHardware");
   var $objectclasses= array("GOhard");
 
-
   function workservice ($config, $dn= NULL)
   {
     plugin::plugin ($config, $dn);
@@ -293,6 +292,11 @@ class workservice extends plugin
   /* Save to LDAP */
   function save()
   {
+    /* remove objectclass GOhard if this is an ogroup tab */
+    if(isset($this->parent->by_object['ogroup'])){
+      $this->objectclasses = array();
+    }
+
     plugin::save();
 
     /* Strip out 'default' values */

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index fc875774d89070a6af2c8e41bd0e4acaee059773..f2901ef4560d5f764e42a8768f16a36a92e28247 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -798,7 +798,7 @@ class workstartup extends plugin
      * if we are currently editing from ogroup menu we use (array("gotWorkstationTemplate","GOhard", "FAIobject"))
      */
     if(isset($this->parent->by_object['ogroup'])){
-      $this->objectclasses = array("gotoWorkstationTemplate","GOhard", "FAIobject");
+      $this->objectclasses = array("gotoWorkstationTemplate", "FAIobject");
     }elseif(isset($this->parent->by_object['workgeneric'])){
       $this->objectclasses = array("GOhard", "FAIobject");
     }else{
@@ -913,7 +913,7 @@ class workstartup extends plugin
     $ldap= $this->config->get_ldap_link();
     $ldap->cd($this->dn);
     $this->cleanup();
-$ldap->modify ($this->attrs); 
+    $ldap->modify ($this->attrs); 
 
     show_ldap_error($ldap->get_error());
     $this->handle_post_events("modify");