From 9ec5ed2946e4c80c235b114fdd0b66f940489238 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 25 Apr 2006 12:08:16 +0000 Subject: [PATCH] Updated copy & paste git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3110 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../applications/class_applicationManagement.inc | 4 +++- plugins/admin/groups/class_groupApplication.inc | 3 +++ plugins/admin/groups/class_groupManagement.inc | 16 +++++----------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc index e1a4dd820..2eaa67e21 100644 --- a/plugins/admin/applications/class_applicationManagement.inc +++ b/plugins/admin/applications/class_applicationManagement.inc @@ -246,7 +246,9 @@ class applicationManagement extends plugin $this->CopyPasteHandler->save_object(); $this->CopyPasteHandler->SetVar("base", $_SESSION['CurrentMainBase']); - return($this->CopyPasteHandler->execute()); + if($str = $this->CopyPasteHandler->execute()) { + return($str); + } } diff --git a/plugins/admin/groups/class_groupApplication.inc b/plugins/admin/groups/class_groupApplication.inc index d45a62638..d95e2801d 100644 --- a/plugins/admin/groups/class_groupApplication.inc +++ b/plugins/admin/groups/class_groupApplication.inc @@ -35,6 +35,9 @@ class appgroup extends plugin var $AllAppsForRelease = array(); var $AllAppsForReleaseParameter = array(); + var $CopyPasteVars = array("Categories"); + + function appgroup ($config, $dn= NULL) { plugin::plugin ($config, $dn); diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc index 4eedcbacb..70bb5499a 100644 --- a/plugins/admin/groups/class_groupManagement.inc +++ b/plugins/admin/groups/class_groupManagement.inc @@ -211,7 +211,11 @@ class groupManagement extends plugin if(($s_action == "editPaste") || ($this->CopyPasteHandler->stillOpen())){ $this->CopyPasteHandler->save_object(); $this->CopyPasteHandler->SetVar("base",$_SESSION['CurrentMainBase']); - return($this->CopyPasteHandler->execute()); + if($str = $this->CopyPasteHandler->execute()){ + return( $str); + }; + /* Ensure that the new object is shown in the list now */ + $this->relaod(); } @@ -228,16 +232,6 @@ class groupManagement extends plugin $obj->set_acl($acl); $objNew->set_acl($acl); $this->CopyPasteHandler->Copy($obj,$objNew); - - foreach($this->CopyPasteHandler->current->by_object as $name => $obj){ - foreach(array('is_account','gotoHotplugDevices','gotoLogonScripts', - 'gotoProfileServers','gotoProfileFlag_C','gotoProfileFlag_L', - 'gotoPrinter','useProfile','OrigCn','Categories') as $attr){ - if(isset($obj->$attr)){ - $this->CopyPasteHandler->current->by_object[$name]->$attr = $obj->$attr; - } - } - } } -- 2.30.2