These objects are not removable...

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

diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 254eff4903c9e3bcd8bf71dc3a71e692eac3aded..6be034cbb4ea1082f168f535afcc0e2c5cfc21e6 100644 (file)
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -462,7 +462,8 @@ class systems extends plugin
           $this->systab= new $tabtype($this->config,
              $this->config->data['TABS']['TERMTABS'], $this->dn);
           $this->systab->set_acl(array($this->acl));
-          $this->systab->by_object['termgeneric']->remove_from_parent ();
+          $this->systab->delete();
+          #$this->systab->by_object['termgeneric']->remove_from_parent ();
         }
         unset ($this->systab);
         gosa_log ("System object'".$this->dn."' has been removed");

diff --git a/plugins/admin/systems/class_terminalInfo.inc b/plugins/admin/systems/class_terminalInfo.inc
index e60405bba54bde7820bd02581fa36dc48743c2b9..141dd6eae3d8fe6a6443f4213eaf84b66a4749fb 100644 (file)
--- a/plugins/admin/systems/class_terminalInfo.inc
+++ b/plugins/admin/systems/class_terminalInfo.inc
@@ -223,9 +223,6 @@ class terminfo extends plugin
 
   function remove_from_parent()
   {
-    $ldap= $this->config->get_ldap_link();
-    $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error());
   }
 
 

diff --git a/plugins/admin/systems/class_terminalService.inc b/plugins/admin/systems/class_terminalService.inc
index 6dfea3537493ea6d3fa7904eb55d07c4915f43ee..6cce41a472e530ac7f8f8f0ecd40881c50561157 100644 (file)
--- a/plugins/admin/systems/class_terminalService.inc
+++ b/plugins/admin/systems/class_terminalService.inc
@@ -209,9 +209,6 @@ class termservice extends plugin
 
   function remove_from_parent()
   {
-    $ldap= $this->config->get_ldap_link();
-    $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error());
     $this->handle_post_events("remove");
   }
 

diff --git a/plugins/admin/systems/class_terminalStartup.inc b/plugins/admin/systems/class_terminalStartup.inc
index 4befeacf061cc92d8870f639dcb14ff8e18fa988..6a80c0de5786968a146b954f092c94394105cf5b 100644 (file)
--- a/plugins/admin/systems/class_terminalStartup.inc
+++ b/plugins/admin/systems/class_terminalStartup.inc
@@ -196,10 +196,7 @@ class termstartup extends plugin
 
   function remove_from_parent()
   {
-    $ldap= $this->config->get_ldap_link();
-    $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error());
-    $this->handle_post_events("remove");
+      $this->handle_post_events("remove");
   }
 
 

diff --git a/plugins/admin/systems/class_workstationService.inc b/plugins/admin/systems/class_workstationService.inc
index 4e773a46f5672e5adf5c0ea509f8b9672ed68d67..d226a77ef6b53488f1d0552f83596fd82959ebb6 100644 (file)
--- a/plugins/admin/systems/class_workstationService.inc
+++ b/plugins/admin/systems/class_workstationService.inc
@@ -193,23 +193,8 @@ class workservice extends plugin
 
   function remove_from_parent()
   {
-    /* This is not necessary, i think 
-     * Remove should be called from workGeneric ... 
-     */
-    /*$ldap= $this->config->get_ldap_link();
-    $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error());
-    $this->handle_post_events("remove");
-    */
-   
-    /* This only removes the attributes from this tab, 
-     * and not hte whole entry 
-     */ 
-    $ldap= $this->config->get_ldap_link();
-    plugin::remove_from_parent();
-    $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
-    show_ldap_error($ldap->get_error());}
+      $this->handle_post_events("remove");
+  }
 
 
   /* Save data to object */

diff --git a/plugins/admin/systems/class_workstationStartup.inc b/plugins/admin/systems/class_workstationStartup.inc
index 87c53ee721d91d665e0cedcb2dc01a098c687d09..1653aab8e11d34db74a31a03148fd289a4e5a635 100644 (file)
--- a/plugins/admin/systems/class_workstationStartup.inc
+++ b/plugins/admin/systems/class_workstationStartup.inc
@@ -437,40 +437,7 @@ class workstartup extends plugin
 
   function remove_from_parent()
   {
-    /*
-    $ldap= $this->config->get_ldap_link();
-    $ldap->rmdir($this->dn);
-    show_ldap_error($ldap->get_error());
     $this->handle_post_events("remove");
-    */
-
-
-    /* Depending on the baseobject (Ogroup / WS) we
-     *  use another set of objectClasses
-     * In case of WS itself, we use  "array("GOhard", "FAIobject");"
-     * 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");
-    }elseif(isset($this->parent->by_object['workgeneric'])){
-      $this->objectclasses = array("GOhard", "FAIobject");
-    }else{
-      print "unknown";
-      exit();
-    }
-
-    $ldap= $this->config->get_ldap_link();
-    plugin::remove_from_parent();
-   
-    /* Remove additional attributes.*/ 
-    foreach(array("gotoModules", "gotoAutoFs", "gotoFilesystem") as $attr){
-      $this->attrs [$attr] = array();
-    }
-
-    $ldap->cd($this->dn);
-    $ldap->modify($this->attrs);
-    show_ldap_error($ldap->get_error());
-
   }