summaryrefslogtreecommitdiff
path: root/roundcubemail/program/js
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-04-13 07:24:09 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-04-13 07:24:09 +0000
commit14da6187de40ae201a20b80aa958ae8d0b14f553 (patch)
treec9d49ac69cc1ef87174adf01017fd695b2fcde62 /roundcubemail/program/js
parent5e3c5775c0b6c6df664412e8bdf5872dfe9e8a9e (diff)
Assign newly created contacts to the active group (#1486626) and fix group selection display (#1486619)
git-svn-id: https://svn.roundcube.net/trunk@3485 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/js')
-rw-r--r--roundcubemail/program/js/app.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 946c43062..8b5460ac4 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -525,7 +525,7 @@ function rcube_webmail()
this.reset_qsearch();
this.list_contacts(props);
- this.enable_command('add', 'import', (this.env.address_sources && !this.env.address_sources[props].readonly));
+ this.enable_command('add', 'import', (this.env.address_sources && !this.env.address_sources[this.env.source].readonly));
}
break;
@@ -3443,8 +3443,7 @@ function rcube_webmail()
else if (group != this.env.group)
page = this.env.current_page = 1;
- this.select_folder(src, this.env.source);
- this.select_folder(group, this.env.group, 'rcmliG');
+ this.select_folder((group ? 'G'+group : src), (this.env.group ? 'G'+this.env.group : this.env.source));
this.env.source = src;
this.env.group = group;
@@ -3516,7 +3515,7 @@ function rcube_webmail()
if (action && (cid || action=='add') && !this.drag_active)
{
this.set_busy(true);
- target.location.href = this.env.comm_path+'&_action='+action+'&_source='+urlencode(this.env.source)+'&_cid='+urlencode(cid) + add_url;
+ target.location.href = this.env.comm_path+'&_action='+action+'&_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+'&_cid='+urlencode(cid) + add_url;
}
return true;
};