diff --git a/admin/views.py b/admin/views.py index 88427ae15..e70b52516 100644 --- a/admin/views.py +++ b/admin/views.py @@ -574,7 +574,7 @@ def edit_domain_admin(request, da_id, tplname="admin/adminform.html"): @login_required @permission_required("auth.view_permissions") -def domain_admin_promotion(request): +def domain_admin_promotion(request, tplname="admin/domain_admin_promotion.html"): if request.method == "POST": form = DomainAdminPromotionForm(request.POST) if form.is_valid(): @@ -590,9 +590,10 @@ def domain_admin_promotion(request): messages.info(request, _("Domain admin added"), fail_silently=True) return ajax_response(request, url=reverse(admin.views.permissions)) + return ajax_response(request, status="ko", template=tplname, form=form) + form = DomainAdminPromotionForm() - return ajax_response(request, template="admin/domain_admin_promotion.html", - form=form) + return ajax_response(request, template=tplname, form=form) @login_required @permission_required("auth.view_permissions") diff --git a/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html b/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html index 7f8790c35..c7a9a6fe2 100644 --- a/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html +++ b/extensions/postfix_autoreply/templates/postfix_autoreply/autoreply.html @@ -16,8 +16,9 @@ @@ -29,7 +31,8 @@ $(document).addEvent("domready", function() { {% block content %}

{{ title }}

{% if error %}
{{ error }}
{% endif %} -
+ {% include "common/genericform.html" %}
diff --git a/extensions/sievefilters/views.py b/extensions/sievefilters/views.py index 59774e488..70c2dba2a 100644 --- a/extensions/sievefilters/views.py +++ b/extensions/sievefilters/views.py @@ -28,9 +28,9 @@ def index(request, tplname="sievefilters/index.html"): return _render_error(request, user_context={"error" : e}) if active_script is None: active_script = "" - default_script = scripts[0] if len(scripts) else "" + default_script = "%s/" % scripts[0] if len(scripts) else "" else: - default_script = active_script + default_script = "%s/" % active_script return _render(request, tplname, { "active_script" : active_script, "default_script" : default_script, diff --git a/extensions/webmail/templates/webmail/folder.html b/extensions/webmail/templates/webmail/folder.html index 1abc6a5b2..62af3b982 100644 --- a/extensions/webmail/templates/webmail/folder.html +++ b/extensions/webmail/templates/webmail/folder.html @@ -6,6 +6,8 @@ + {% endblock %} {% block content %} {% load i18n %}