Don't expand recipient groups if they have an email address

Thomas Bruederli

2014-08-18 96f084e9cf30fe714efd4ffd5ac6216b4d773d74

Don't expand recipient groups if they have an email address

 program/js/app.js

@@ -4439,7 +4439,7 @@
    this.ksearch_destroy();

    // insert all members of a group
    if (typeof this.env.contacts[id] === 'object' && this.env.contacts[id].type == 'group') {
    if (typeof this.env.contacts[id] === 'object' && this.env.contacts[id].type == 'group' && !this.env.contacts[id].email) {
      insert += this.env.contacts[id].name + this.env.recipients_delimiter;
      this.group2expand[this.env.contacts[id].id] = $.extend({ input: this.ksearch_input }, this.env.contacts[id]);
      this.http_request('mail/group-expand', {_source: this.env.contacts[id].source, _gid: this.env.contacts[id].id}, false);

 program/steps/mail/autocomplete.inc

@@ -124,7 +124,13 @@
                if ($group_prop['email']) {
                    $idx = 0;
                    foreach ((array)$group_prop['email'] as $email) {
                        $contacts[]  = array('name' => format_email_recipient($email, $group['name']), 'type' => 'group');
                        $contacts[]  = array(
                            'name'   => format_email_recipient($email, $group['name']),
                            'email'  => $email,
                            'type'   => 'group',
                            'id'     => $group['ID'],
                            'source' => $id,
                        );
                        $sort_keys[] = sprintf('%s %03d', $group['name'] , $idx++);

                        if (count($contacts) >= $MAXNUM) {