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

diff --git a/plugins/admin/groups/class_groupGeneric.inc b/plugins/admin/groups/class_groupGeneric.inc
index 37c5c0babace3cdf386f028fe084e33f21807398..588c842c88c6e81599fc153bbfa3de05102fd2e6 100644 (file)
--- 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 f7dbb724a4282ce06e9ea3801ae6ad471107f63d..fd9df5eec1534820afd8a6baed5194933db0faab 100644 (file)
--- 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 6b98184b26b9c53f68b7482ebddb6fcb162684ef..f08d2431520a3986bb8e3af24587261d729af261 100644 (file)
--- a/plugins/admin/groups/paste_generic.tpl
+++ b/plugins/admin/groups/paste_generic.tpl
@@ -11,7 +11,7 @@
        <tr>
                <td>
                        <input type=checkbox name='force_gid' value='1' {$used} title='{t}Normally IDs are autogenerated, select to specify manually{/t}' 
-                               onclick='changeState(\"gidNumber\")'>
+                               onclick='changeState("gidNumber")'>
                        <LABEL for='gidNumber'>{t}Force GID{/t}</LABEL>
                </td>
                <td>