From 664ac34d7cde81203f59e2ede1b3fd29875bd211 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 28 May 2008 13:42:19 +0000 Subject: [PATCH] Updated copy & paste base adaption git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@11088 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/plugins/admin/groups/class_groupManagement.inc | 2 +- gosa-core/plugins/admin/ogroups/class_ogroupManagement.inc | 2 +- gosa-core/plugins/admin/users/class_userManagement.inc | 3 +-- .../gofax/gofax/blocklists/class_blocklistManagement.inc | 2 +- .../gofon/gofon/conference/class_phoneConferenceManagment.inc | 2 +- gosa-plugins/gofon/gofon/macro/class_gofonMacroManagement.inc | 2 +- gosa-plugins/goto/admin/devices/class_deviceManagement.inc | 2 +- gosa-plugins/sudo/admin/sudo/class_sudoManagement.inc | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/gosa-core/plugins/admin/groups/class_groupManagement.inc b/gosa-core/plugins/admin/groups/class_groupManagement.inc index ea0aa64c7..f28e16644 100644 --- 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 6fd1cb247..13f84e40e 100644 --- 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 539b896e7..202e617cd 100644 --- 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 a4c3eddd1..76ddca75e 100644 --- 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 dacf2a8bf..3a138c3c6 100644 --- 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 9a08afa30..531b25635 100644 --- 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 4ae970df4..5c6e8e98d 100644 --- 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 c368abdf5..54d6dd523 100644 --- 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)){ -- 2.30.2