* Added result messages about folder operations,

* Better display (I hope) of those messages.

see #55
This commit is contained in:
Antoine Nguyen
2011-03-30 19:15:21 +02:00
parent b997dec8f4
commit 3a29f1345e
6 changed files with 36 additions and 23 deletions
+1 -1
View File
@@ -8,4 +8,4 @@ class WebmailErrorMiddleware(object):
if not isinstance(exception, WebmailError):
return None
return ajax_response(request, status="ko",
error=str(exception), norefresh=True)
respmsg=str(exception), norefresh=True)
+5 -3
View File
@@ -51,7 +51,7 @@ var FdMenu = new Class({
onSuccess: function(resp) {
if (resp.status == "ok") {
var dfolder = this.current_folder + "/";
infobox.info(gettext("Folder deleted."));
if (dfolder == current_anchor.base) {
var pfolder = ((this.current_folder.split(".")).slice(0, -1)).join(".");
if (pfolder == "") {
@@ -59,9 +59,11 @@ var FdMenu = new Class({
}
current_anchor.baseurl(pfolder, 1);
}
current_anchor.update.delay(500, current_anchor, 1);
current_anchor.loading_message = gettext("Folder deleted");
current_anchor.loading_color = "green";
current_anchor.update(1);
} else {
infobox.error(gettext("Failed to delete folder"));
infobox.error(resp.error);
infobox.hide(2);
}
}.bind(this)
+13 -13
View File
@@ -8,6 +8,7 @@ from django.utils import simplejson
from django.utils.translation import ugettext as _
from django.core.urlresolvers import reverse
from django.contrib.auth.decorators import login_required
from django.contrib import messages
from modoboa.admin.models import Mailbox
from modoboa.lib import parameters, _render, _render_error, \
getctx, is_not_localadmin, _render_to_string, split_mailbox, \
@@ -459,7 +460,7 @@ def newfolder(request, tplname="webmail/folder.html"):
pf = request.POST.has_key("parent_folder") \
and request.POST["parent_folder"] or None
mbc.create_folder(form.cleaned_data["name"], pf)
return ajax_response(request, ajaxnav=True)
return ajax_response(request, ajaxnav=True, respmsg=_("Folder created"))
ctx["form"] = form
ctx["selected"] = None
@@ -487,17 +488,16 @@ def editfolder(request, tplname="webmail/folder.html"):
and request.POST["parent_folder"] or None
ctx["selected"] = pf
oldname, oldparent = separate_folder(request.POST["oldname"])
try:
extra = {}
if form.cleaned_data["name"] != oldname \
or (pf is not None and pf != oldparent):
newname = form.cleaned_data["name"] if pf is None \
else "%s.%s" % (pf, form.cleaned_data["name"])
mbc.rename_folder(request.POST["oldname"], newname)
extra["url"] = newname
return ajax_response(request, ajaxnav=True, **extra)
except Exception:
pass
extra = {}
if form.cleaned_data["name"] != oldname \
or (pf is not None and pf != oldparent):
newname = form.cleaned_data["name"] if pf is None \
else "%s.%s" % (pf, form.cleaned_data["name"])
mbc.rename_folder(request.POST["oldname"], newname)
extra["url"] = newname
return ajax_response(request, ajaxnav=True,
respmsg=_("Folder modified"), **extra)
ctx["form"] = form
return ajax_response(request, status="ko", template=tplname, **ctx)
@@ -519,4 +519,4 @@ def delfolder(request):
mbc = IMAPconnector(user=request.user.username,
password=request.session["password"])
mbc.delete_folder(request.GET["name"])
return ajax_response(request, status="ko")
return ajax_response(request)