[debian-edu-commits] debian-edu/upstream/ 01/01: empty mail field on multi-edits: Remember objects' former mail addresses and reinstate them after plugin::set_multi_edit_values() has been called.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch master
in repository gosa-plugin-mailaddress.

commit f926e25c01ce58191a798bddb419c06ea2a25310
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Aug 27 01:01:03 2015 +0200

    empty mail field on multi-edits: Remember objects' former mail addresses and reinstate them after plugin::set_multi_edit_values() has been called.
---
 admin/groups/mailaddress/class_groupMail.inc | 7 +++++++
 personal/mailaddress/class_mailAccount.inc   | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/admin/groups/mailaddress/class_groupMail.inc b/admin/groups/mailaddress/class_groupMail.inc
index b3c0f49..99bae2c 100644
--- a/admin/groups/mailaddress/class_groupMail.inc
+++ b/admin/groups/mailaddress/class_groupMail.inc
@@ -573,9 +573,16 @@ class mailgroup extends plugin
             if(!$this->is_account && $this->acl_is_createable()){
                 $this->is_account= TRUE;
             }
+        } else {
+            $mail = $this->mail;
         }
 
         plugin::set_multi_edit_values($attrs);
+
+        if(!$mail_pattern){
+            $this->mail= $mail;
+        }
+
         $this->gosaMailForwardingAddress = $forward;
     }
 
diff --git a/personal/mailaddress/class_mailAccount.inc b/personal/mailaddress/class_mailAccount.inc
index ac73dd1..c883d76 100644
--- a/personal/mailaddress/class_mailAccount.inc
+++ b/personal/mailaddress/class_mailAccount.inc
@@ -412,9 +412,15 @@ class mailAccount extends plugin
       if(!$this->is_account && $this->acl_is_createable()){
           $this->is_account= TRUE;
       }
+    } else {
+      $mail = $this->mail;
     }
 
     plugin::set_multi_edit_values($attrs);
+
+    if(!$mail_pattern){
+      $this->mail
+    }
   }
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/gosa-plugin-mailaddress.git