From 8e3a6039cfefb8f351d2696ebdcfa26cc5d4cef9 Mon Sep 17 00:00:00 2001 From: thomascube Date: Tue, 13 Apr 2010 07:24:09 +0000 Subject: Assign newly created contacts to the active group (#1486626) and fix group selection display (#1486619) --- program/js/app.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'program/js') diff --git a/program/js/app.js b/program/js/app.js index 946c43062..8b5460ac4 100644 --- a/program/js/app.js +++ b/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; }; -- cgit v1.2.3