summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2010-04-13 07:24:09 +0000
committerthomascube <thomas@roundcube.net>2010-04-13 07:24:09 +0000
commit8e3a6039cfefb8f351d2696ebdcfa26cc5d4cef9 (patch)
tree32e17ad5447f3e7b61ddaa1f5d85d2c7f94a0849 /program/js
parent6b01133063cf1c138d4820f43206a4b16c802387 (diff)
Assign newly created contacts to the active group (#1486626) and fix group selection display (#1486619)
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js7
1 files changed, 3 insertions, 4 deletions
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;
};