Updated copy & paste

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

diff --git a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
index 55bdfda21019330b49ff43b4ddbc2b94d18e4609..7f871268619f99c16cf6aecd93976321f7eb72c6 100644 (file)
--- a/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
+++ b/gosa-plugins/gofon/gofon/conference/class_phoneConferenceManagment.inc
@@ -503,12 +503,9 @@ class phoneConferenceManagment extends plugin
     /* Return C&P dialog */
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
 
-      /* Load entry from queue and set base */
-      $this->CopyPasteHandler->load_entry_from_queue();
-      $this->CopyPasteHandler->SetVar("base",$this->DivListConference->selectedBase);
-
       /* Get dialog */
       $data = $this->CopyPasteHandler->execute();
+      $this->CopyPasteHandler->SetVar("base",$this->DivListConference->selectedBase);
 
       /* 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 2fd5640099fbf5cf6510ca715fe12bd8c8a95c28..e60c943b221224ea277e8a947c688af613d19eb9 100644 (file)
--- a/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
+++ b/gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc
@@ -465,12 +465,9 @@ class goFonMacro extends plugin
     /* Return C&P dialog */
     if($this->start_pasting_copied_objects && $this->CopyPasteHandler->entries_queued()){
 
-      /* Load entry from queue and set base */
-      $this->CopyPasteHandler->load_entry_from_queue();
-      $this->CopyPasteHandler->SetVar("base",$this->DivListMacro->selectedBase);
-
       /* Get dialog */
       $data = $this->CopyPasteHandler->execute();
+      $this->CopyPasteHandler->SetVar("base",$this->DivListMacro->selectedBase);
 
       /* Return dialog data */
       if(!empty($data)){