From de6d2794faf5ad11fdc64e11fa1ccde01a45cdb8 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 17 Apr 2013 14:16:46 +0200 Subject: [PATCH] Displaying errors correctly --- modoboa/extensions/postfix_autoreply/views.py | 12 +++++----- modoboa/userprefs/views.py | 22 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modoboa/extensions/postfix_autoreply/views.py b/modoboa/extensions/postfix_autoreply/views.py index 3e096c3aa..07676d9f4 100644 --- a/modoboa/extensions/postfix_autoreply/views.py +++ b/modoboa/extensions/postfix_autoreply/views.py @@ -33,14 +33,14 @@ def autoreply(request, tplname="postfix_autoreply/autoreply.html"): arm.mbox = mb arm.save() return ajax_simple_response(dict( - status="ok", respmsg=_("Auto reply message updated successfully.") - )) + status="ok", respmsg=_("Auto reply message updated successfully.") + )) return ajax_simple_response({ - "status" : "ko", - "content" : render_to_string(tplname, {"form" : form}), - "onload_cb" : "autoreply_cb" - }) + "status": "ko", + "errors": form.errors, + "onload_cb": "autoreply_cb" + }) form = ARmessageForm(instance=arm) if arm is not None: diff --git a/modoboa/userprefs/views.py b/modoboa/userprefs/views.py index b81518ec8..229d858e3 100644 --- a/modoboa/userprefs/views.py +++ b/modoboa/userprefs/views.py @@ -51,7 +51,7 @@ def forward(request, tplname='userprefs/forward.html'): return ajax_simple_response(dict( status="ko", - content=render_to_string(tplname, {"form" : form}), + errors=form.errors, respmsg=error )) @@ -84,20 +84,20 @@ def profile(request, tplname='userprefs/profile.html'): if update_password: request.session["password"] = encrypt(form.cleaned_data["confirmation"]) return ajax_simple_response(dict( - status="ok", respmsg=_("Profile updated") - )) + status="ok", respmsg=_("Profile updated") + )) return ajax_simple_response({ - "status" : "ko", - "content" : render_to_string(tplname, {"form" : form}) - }) + "status": "ko", + "errors": form.errors + }) form = ProfileForm(update_password, instance=request.user) return ajax_simple_response({ - "status" : "ok", - "content" : render_to_string(tplname, { - "form" : form - }) - }) + "status": "ok", + "content": render_to_string(tplname, { + "form": form + }) + }) @login_required def preferences(request):