Updated copy & paste base adaption

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

diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc
index ea0aa64c7be7ba1a50b4296c3eb75c4785c396f1..f28e1664434a653e6264982fdf99e46c696ffdb0 100644 (file)
--- a/gosa-core/plugins/admin/groups/class_groupManagement.inc
+++ b/gosa-core/plugins/admin/groups/class_groupManagement.inc
@@ -771,8 +771,8 @@ class groupManagement extends plugin
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
 
       /* Get dialog */
-      $data = $this->CopyPasteHandler->execute();
       $this->CopyPasteHandler->SetVar("base",$this->DivListGroup->selectedBase);
+      $data = $this->CopyPasteHandler->execute();
 
       /* Return dialog data */
       if(!empty($data)){

diff --git a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
index 6fd1cb24754c7e8b52d97c66df06b582115768b4..13f84e40ee7a02aebc0e3fadc15b3124b5aafa21 100644 (file)
--- a/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc
@@ -688,8 +688,8 @@ class ogroupManagement extends plugin
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
 
       /* Get dialog */
-      $data = $this->CopyPasteHandler->execute();
       $this->CopyPasteHandler->SetVar("base",$this->DivListOGroup->selectedBase);
+      $data = $this->CopyPasteHandler->execute();
 
       /* Return dialog data */
       if(!empty($data)){

diff --git a/gosa-core/plugins/admin/users/class_userManagement.inc b/gosa-core/plugins/admin/users/class_userManagement.inc
index 539b896e79a0a1b8af24300979a428f9876cc0d4..202e617cde77b9b7418a5e0bedb7c28079e2ee80 100644 (file)
--- a/gosa-core/plugins/admin/users/class_userManagement.inc
+++ b/gosa-core/plugins/admin/users/class_userManagement.inc
@@ -1118,7 +1118,6 @@ class userManagement extends plugin
 
       /* Cleanup object queue */
       $this->CopyPasteHandler->cleanup_queue();
-      $this->CopyPasteHandler->SetVar("base",$this->DivListUsers->selectedBase); 
       $dn = $this->list[$s_entry]['dn'];
       if($s_action == "copy" && preg_match("/r/",$ui->has_complete_category_acls($dn,"users"))){
         $this->CopyPasteHandler->add_to_queue($dn,$s_action,"usertabs","USERTABS","users");
@@ -1133,7 +1132,6 @@ class userManagement extends plugin
 
       /* Cleanup object queue */
       $this->CopyPasteHandler->cleanup_queue();
-      $this->CopyPasteHandler->SetVar("base",$this->DivListUsers->selectedBase); 
 
       /* Add new entries to CP queue */
       foreach($this->list_get_selected_items() as $id){
@@ -1157,6 +1155,7 @@ class userManagement extends plugin
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
    
       /* Get dialog */
+      $this->CopyPasteHandler->SetVar("base",$this->DivListUsers->selectedBase); 
       $data = $this->CopyPasteHandler->execute();
 
       /* Set CPPasswordChange to s_entry which indicates that this entry requires a new password. */

diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
index a4c3eddd1f5efb189fa9108a68c68922349b2f2c..76ddca75e74502b6993f4be75c16977c07c60829 100644 (file)
--- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
@@ -482,8 +482,8 @@ class blocklist extends plugin
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
 
       /* Get dialog */
-      $data = $this->CopyPasteHandler->execute();
       $this->CopyPasteHandler->SetVar("base",$this->DivListBlocklist->selectedBase);
+      $data = $this->CopyPasteHandler->execute();
 
       /* Return dialog data */
       if(!empty($data)){

diff --git a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
index dacf2a8bf42f9415bac12f7b34b8907db58571f2..3a138c3c6d16cb1d0d0dc132c9497105c77d3c25 100644 (file)
--- a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
+++ b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
@@ -522,8 +522,8 @@ class phoneConferenceManagment extends plugin
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
 
       /* Get dialog */
-      $data = $this->CopyPasteHandler->execute();
       $this->CopyPasteHandler->SetVar("base",$this->DivListConference->selectedBase);
+      $data = $this->CopyPasteHandler->execute();
 
       /* Return dialog data */
       if(!empty($data)){

diff --git a/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc b/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
index 9a08afa30e5034e0cd5ec55a05fefd211aab3b27..531b25635914377160725548e3195b610425155f 100644 (file)
--- a/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
+++ b/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
@@ -500,8 +500,8 @@ class goFonMacro extends plugin
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
 
       /* Get dialog */
-      $data = $this->CopyPasteHandler->execute();
       $this->CopyPasteHandler->SetVar("base",$this->DivListMacro->selectedBase);
+      $data = $this->CopyPasteHandler->execute();
 
       /* Return dialog data */
       if(!empty($data)){

diff --git a/gosa-plugins/goto/admin/devices/class_deviceManagement.inc b/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
index 4ae970df4dfe4d7f6d21b840c409e2f727862886..5c6e8e98da62571149d172f265970767efafa8d5 100644 (file)
--- a/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
+++ b/gosa-plugins/goto/admin/devices/class_deviceManagement.inc
@@ -500,8 +500,8 @@ class deviceManagement extends plugin
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
 
       /* Get dialog */
-      $data = $this->CopyPasteHandler->execute();
       $this->CopyPasteHandler->SetVar("base",$this->DivListDevices->selectedBase);
+      $data = $this->CopyPasteHandler->execute();
 
       /* Return dialog data */
       if(!empty($data)){

diff --git a/gosa-plugins/sudo/admin/sudo/class_sudoManagement.inc b/gosa-plugins/sudo/admin/sudo/class_sudoManagement.inc
index c368abdf5d1a3f563b113e52a92267f31789ad11..54d6dd5232a923501fd27a33c51a22b49ede24e6 100644 (file)
--- a/gosa-plugins/sudo/admin/sudo/class_sudoManagement.inc
+++ b/gosa-plugins/sudo/admin/sudo/class_sudoManagement.inc
@@ -504,8 +504,8 @@ class sudoManagement extends plugin
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
 
       /* Get dialog */
-      $data = $this->CopyPasteHandler->execute();
       $this->CopyPasteHandler->SetVar("base",$this->DivListSudo->selectedBase);
+      $data = $this->CopyPasteHandler->execute();
 
       /* Return dialog data */
       if(!empty($data)){