github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-17 05:41:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Mailbox rename is now working as expected.

Browse Source 
fix #383
This commit is contained in:
Antoine Nguyen
2013-02-27 00:30:19 +01:00
parent 3206ac2161
commit 853f7fb3c7
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/extensions/webmail/static/webmail/js/webmail.js
+6 -4
View File
@@ -558,16 +558,18 @@ Webmail.prototype = {
* If needed, the mailbox will be moved to its new location.
*/
rename_mailbox: function(oldname, newname, oldparent, newparent) {
var pattern = (oldparent) ? oldparent + "." + oldname : oldname;
var $link = $("#folders").find('a[href="' + pattern + '"]');
var oldpattern = (oldparent) ? oldparent + "." + oldname : oldname;
var newpattern = (newparent) ? newparent + "." + newparent : newname;
var $link = $("#folders").find('a[href="' + oldpattern + '"]');
if (oldname != newname) {
var $i = $link.children("i");
$link.html(newname);
$link.parent("li").attr("name", pattern);
$link.parent("li").attr("name", newpattern);
$link.prepend($i);
$link.attr("href", pattern);
$link.attr("href", newpattern);
this.navobject.setparam("mbox", newname).update(false, true);
}
if (oldparent != newparent) {
var newlocation = (newparent) ? newparent + "." + newname : newname;
modoboa/extensions/webmail/views.py
+3 -3
View File
@@ -163,8 +163,7 @@ def editfolder(request, tplname="webmail/folder.html"):
if request.method == "POST":
form = FolderForm(request.POST)
if form.is_valid():
pf = request.POST.has_key("parent_folder") \
and request.POST["parent_folder"] or None
pf = request.POST.get("parent_folder", None)
ctx["selected"] = pf
oldname, oldparent = separate_mailbox(request.POST["oldname"])
res = dict(status="ok", respmsg=_("Mailbox updated"))
@@ -177,7 +176,8 @@ def editfolder(request, tplname="webmail/folder.html"):
res["newmb"] = form.cleaned_data["name"]
res["oldparent"] = oldparent
res["newparent"] = pf
del request.session["mbox"]
if "mbox" in request.session:
del request.session["mbox"]
return ajax_simple_response(res)
ctx["mboxes"] = mbc.getmboxes(request.user)