Support *appended* text also in creation screens.

see #276
This commit is contained in:
Antoine Nguyen
2012-06-25 16:28:13 +02:00
parent f8b3350a1d
commit 2843aa6ddf
4 changed files with 7 additions and 5 deletions
@@ -11,7 +11,7 @@
{% for step in steps %}
<div id="step{{ forloop.counter }}"
class="item{% if forloop.first %} active{% endif %}">
{% render_form step.form %}
{% if step.formtpl %}{% render_form step.form step.formtpl %}{% else %}{% render_form step.form %}{% endif %}
</div>
{% endfor %}
</div>
@@ -1,6 +1,6 @@
{% extends "common/generic_modal_form.html" %}{% load libextras %}{% block formbody %}
{% render_field form.name %}
{% render_field form.quota %}
{% render_field_appended form.quota _("MB") %}
{% render_fields_group form "aliases" %}
{% render_field form.enabled %}
{% endblock %}
+2 -1
View File
@@ -361,7 +361,8 @@ def newaccount(request, tplname='admin/newaccount.html'):
new_args=[request.user])
cwizard.add_step(AccountFormMail, _("Mail"),
[dict(classes="btn-primary submit", label=_("Create")),
dict(classes="btn-inverse prev", label=_("Previous"))])
dict(classes="btn-inverse prev", label=_("Previous"))],
formtpl="admin/mailform.html")
if request.method == "POST":
retcode, data = cwizard.validate_step(request)
+3 -2
View File
@@ -14,8 +14,9 @@ class CreationWizard(object):
self.steps = []
self.done_cb = done_cb
def add_step(self, cls, title, buttons, new_args=None):
self.steps += [dict(cls=cls, title=title, buttons=buttons, new_args=new_args)]
def add_step(self, cls, title, buttons, formtpl=None, new_args=None):
self.steps += [dict(cls=cls, title=title, buttons=buttons,
formtpl=formtpl, new_args=new_args)]
def create_forms(self, data=None):
for step in self.steps: