From b5454c5f9b567b6a6ab29089563a77d00f5db194 Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 14 Nov 2006 12:27:03 +0000 Subject: [PATCH] Fixed some group copy and paste probs git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5110 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/groups/class_groupGeneric.inc | 2 ++ plugins/admin/groups/class_groupMail.inc | 7 ++++++- plugins/admin/groups/paste_generic.tpl | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc index 37c5c0bab..588c842c8 100644 --- a/plugins/admin/groups/class_groupGeneric.inc +++ b/plugins/admin/groups/class_groupGeneric.inc @@ -41,6 +41,8 @@ class group extends plugin var $allowGroupsWithSameNameInOtherSubtrees = true; + var $CopyPasteVars = array("force_gid","fon_group","smbgroup","groupType","sambaSID","sambaDomainName","SID","nagios_group","sambaGroupType"); + /* attribute list for save action */ var $attributes= array("cn", "description", "gidNumber","memberUid","sambaGroupType","sambaSID"); var $objectclasses= array("top", "posixGroup"); diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc index f7dbb724a..fd9df5eec 100644 --- a/plugins/admin/groups/class_groupMail.inc +++ b/plugins/admin/groups/class_groupMail.inc @@ -1001,8 +1001,13 @@ I: Only insider delivery */ } } + function PrepareForCopyPaste($source) + { + plugin::PrepareForCopyPaste($source); + /* Reset alternate mail addresses */ + $this->gosaMailAlternateAddress = array(); + } } - // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?> diff --git a/plugins/admin/groups/paste_generic.tpl b/plugins/admin/groups/paste_generic.tpl index 6b98184b2..f08d24315 100644 --- a/plugins/admin/groups/paste_generic.tpl +++ b/plugins/admin/groups/paste_generic.tpl @@ -11,7 +11,7 @@ + onclick='changeState("gidNumber")'> -- 2.30.2