summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 29cd913)
raw | patch | inline | side by side (parent: 29cd913)
author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Tue, 12 Jun 2007 10:54:26 +0000 (10:54 +0000) | ||
committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
Tue, 12 Jun 2007 10:54:26 +0000 (10:54 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6569 594d385d-05f5-0310-b6e9-bd551577e9d8
diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 2e5aaa0cd45716e3dc3b4de42ac7353288a62b7b..09a89297c14dc21fb0f6e298376f68bac215cb57 100644 (file)
********************/
/* Display the copy & paste dialog, if it is currently open */
- $ret = $this->copyPasteHandling_from_queue($s_action);
+ $ret = $this->copyPasteHandling_from_queue($s_action,$s_entry);
if($ret){
return($ret);
}
}
- function copyPasteHandling_from_queue($s_action)
+ function copyPasteHandling_from_queue($s_action,$s_entry)
{
+ /* Add a single entry to queue */
+ if($s_action == "cut" || $s_action == "copy"){
+
+ /* Cleanup object queue */
+ $this->CopyPasteHandler->cleanup_queue();
+ $dn = $this->grouplist[$s_entry]['dn'];
+ $this->CopyPasteHandler->add_to_queue($dn,$s_action,"grouptabs","GROUPTABS","groups");
+ }
+
/* Add entries to queue */
if($s_action == "copy_multiple" || $s_action == "cut_multiple"){
diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc
index 34cf7b7b2cdfde0f4b30f92b0ce1093a7ea74cb4..be2c78cf87ebe9cc2d2cb176996531d38ce4a277 100644 (file)
****************/
/* Display the copy & paste dialog, if it is currently open */
- $ret = $this->copyPasteHandling_from_queue($s_action);
+ $ret = $this->copyPasteHandling_from_queue($s_action,$s_entry);
if($ret){
return($ret);
}
}
- function copyPasteHandling_from_queue($s_action)
+ function copyPasteHandling_from_queue($s_action,$s_entry)
{
+ /* Add a single entry to queue */
+ if($s_action == "cut" || $s_action == "copy"){
+
+ /* Cleanup object queue */
+ $this->CopyPasteHandler->cleanup_queue();
+ $dn = $this->ogrouplist[$s_entry]['dn'];
+ $this->CopyPasteHandler->add_to_queue($dn,$s_action,"ogrouptabs","OGROUPTABS","ogroups");
+ }
+
+
/* Add entries to queue */
if($s_action == "copy_multiple" || $s_action == "cut_multiple"){
diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 6109af8349f5887e17ccdc8febaef6f68679728b..ce16140a12c22bb89361745f92ef377007b0b11b 100644 (file)
/* Display the copy & paste dialog, if it is currently open */
if($this->CPPasswordChange == ""){
- $ret = $this->copyPasteHandling_from_queue($s_action);
+ $ret = $this->copyPasteHandling_from_queue($s_action,$s_entry);
if($ret){
return($ret);
}
}
- function copyPasteHandling_from_queue($s_action)
+ function copyPasteHandling_from_queue($s_action,$s_entry)
{
+ /* Add a single entry to queue */
+ if($s_action == "cut" || $s_action == "copy"){
+ /* Cleanup object queue */
+ $this->CopyPasteHandler->cleanup_queue();
+ $dn = $this->list[$s_entry]['dn'];
+ $this->CopyPasteHandler->add_to_queue($dn,$s_action,"usertabs","USERTABS","users");
+ }
/* Add entries to queue */
if($s_action == "copy_multiple" || $s_action == "cut_multiple"){