Reverted 8064

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

diff --git a/include/class_CopyPasteHandler.inc b/include/class_CopyPasteHandler.inc
index e09e6926bd4d212f112086cd148be70b8a708981..aba5e3208a3e1976722044ce7c416f4f8b51b2f1 100644 (file)
--- a/include/class_CopyPasteHandler.inc
+++ b/include/class_CopyPasteHandler.inc
@@ -67,20 +67,6 @@ class CopyPasteHandler {
         }
       }
     }
-
-    /* Ensure that UnitTags will be kept when pasted */
-    if(isset($obj->gosaUnitTag) && !empty($obj->gosaUnitTag)){
-      foreach($this->current->by_object as $name => $obj){
-        if(!in_array("gosaAdministrativeUnitTag",$this->current->by_object[$name]->objectclasses)){
-          $this->current->by_object[$name]->objectclasses[] = "gosaAdministrativeUnitTag";
-          $this->current->by_object[$name]->gosaUnitTag = $obj->gosaUnitTag;
-          if(!in_array("gosaUnitTag",$this->current->by_object[$name]->attributes)){
-            $this->current->by_object[$name]->attributes[] =  "gosaUnitTag";
-          }
-        }
-      }
-    }
-
     if($this->isCurrentObjectPastAble()){
       return(true);
     }else{

diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc
index 3c56f2cdbdb5abdcbdb127d392def07f6ef86031..0ad7dba9e40936965dea554b0fca6810835db848 100644 (file)
--- a/plugins/admin/fai/class_faiHook.inc
+++ b/plugins/admin/fai/class_faiHook.inc
@@ -433,7 +433,7 @@ class faiHook extends plugin
     show_ldap_error($ldap->get_error(), _("Saving FAI hook base failed")); 
 
     /* Do object tagging */
-    $this->handle_object_tagging($this->dn,$this->gosaUnitTag);
+    $this->handle_object_tagging();
 
     $ldap->cd($this->dn);
 

diff --git a/plugins/admin/fai/class_faiPackage.inc b/plugins/admin/fai/class_faiPackage.inc
index 36ad4e38e99b1361b9195ea9622393a7120173c0..32a26f91bb1bca327d91c72be94b119ca651a50d 100644 (file)
--- a/plugins/admin/fai/class_faiPackage.inc
+++ b/plugins/admin/fai/class_faiPackage.inc
@@ -508,7 +508,7 @@ class faiPackage extends plugin
     show_ldap_error($ldap->get_error(), _("Saving FAI package base failed"));
 
     /* Do object tagging */
-    $this->handle_object_tagging($this->dn,$this->gosaUnitTag);
+    $this->handle_object_tagging();
     $ldap->cd($this->dn);
 
     /* Save Package configurations */

diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc
index dfcc7a0e82f89375142c230d03271953966a229c..c85cf9ab33e11f49997054cfe9e286efffb82a78 100644 (file)
--- a/plugins/admin/fai/class_faiPartitionTable.inc
+++ b/plugins/admin/fai/class_faiPartitionTable.inc
@@ -368,7 +368,7 @@ class faiPartitionTable extends plugin
     show_ldap_error($ldap->get_error(), _("Saving FAI partition table base failed"));
   
     /* Do object tagging */
-    $this->handle_object_tagging($this->dn,$this->gosaUnitTag);
+    $this->handle_object_tagging();
   
     /* Sort entries, because we must delete entries with status="delete" first */
     $order = array();

diff --git a/plugins/admin/fai/class_faiProfile.inc b/plugins/admin/fai/class_faiProfile.inc
index 62c13adf9d9b177bd00fa6498d6b2212f5ec6d6f..84e5b40b1174dc503303d66235f18985c104ea0c 100644 (file)
--- a/plugins/admin/fai/class_faiProfile.inc
+++ b/plugins/admin/fai/class_faiProfile.inc
@@ -459,7 +459,7 @@ class faiProfile extends plugin
     show_ldap_error($ldap->get_error(), _("Saving FAI profile failed"));
 
     /* Do object tagging */
-    $this->handle_object_tagging($this->dn,$this->gosaUnitTag);
+    $this->handle_object_tagging();
     show_ldap_error($ldap->get_error());
   }
 

diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc
index 5bfe27019d3021465980e8a783a6446d85c63287..ac945d890fedffa402ae1542b5017aa9546b303a 100644 (file)
--- a/plugins/admin/fai/class_faiScript.inc
+++ b/plugins/admin/fai/class_faiScript.inc
@@ -465,7 +465,7 @@ class faiScript extends plugin
     show_ldap_error($ldap->get_error(), _("Creating FAI script base failed"));
 
     /* Do object tagging */
-    $this->handle_object_tagging($this->dn, $this->gosaUnitTag);
+    $this->handle_object_tagging();
 
     /* Prepare FAIscriptEntry to write it to ldap
      * First sort array.

diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc
index b04e07fc160cb69e4315f2611c95decf78027831..bb552443cfa8a9690ec4711ccc25f151abc6d5e8 100644 (file)
--- a/plugins/admin/fai/class_faiTemplate.inc
+++ b/plugins/admin/fai/class_faiTemplate.inc
@@ -403,7 +403,7 @@ class faiTemplate extends plugin
     show_ldap_error($ldap->get_error(), _("Saving FAI template base failed"));
 
     /* Do object tagging */
-    $this->handle_object_tagging($this->dn,$this->gosaUnitTag);
+    $this->handle_object_tagging();
 
     /* Prepare FAIscriptEntry to write it to ldap
      * First sort array.

diff --git a/plugins/admin/fai/class_faiVariable.inc b/plugins/admin/fai/class_faiVariable.inc
index 19622f165d29264fd548aae2cce45932c6a8f2d2..171ad312d99130b3a8d5beb0ca07efbd7d3adb0f 100644 (file)
--- a/plugins/admin/fai/class_faiVariable.inc
+++ b/plugins/admin/fai/class_faiVariable.inc
@@ -315,7 +315,7 @@ class faiVariable extends plugin
     show_ldap_error($ldap->get_error(), _("Saving FAI variable base failed"));
  
     /* Do object tagging */
-    $this->handle_object_tagging($this->dn,$this->gosaUnitTag);
+    $this->handle_object_tagging();
  
     /* Prepare FAIscriptEntry to write it to ldap
      * First sort array.