From 8b114c5718e332553a3bb9718c707365f7ab5a0a Mon Sep 17 00:00:00 2001 From: "A.Avenel" Date: Mon, 26 Nov 2012 21:52:25 +0100 Subject: [PATCH] update for "create archive" interface --- budget/forms.py | 6 +++--- budget/templates/forms.html | 1 + budget/web.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/budget/forms.py b/budget/forms.py index 5d7c18b5..f243c39c 100644 --- a/budget/forms.py +++ b/budget/forms.py @@ -187,6 +187,6 @@ class InviteForm(Form): class CreateArchiveForm(Form): - start_date = DateField(_("Start date"), validators=[Required(), ]) - end_date = DateField(_("End date"), validators=[Required(), ]) - name = TextField(_("Name for this archive (optional)")) + name = TextField(_("Name for this archive (optional)"), validators=[]) + start_date = DateField(_("Start date"), validators=[Required()]) + end_date = DateField(_("End date"), validators=[Required()], default=datetime.now) diff --git a/budget/templates/forms.html b/budget/templates/forms.html index 8d15cb88..2904e0d5 100644 --- a/budget/templates/forms.html +++ b/budget/templates/forms.html @@ -108,6 +108,7 @@
{{ _("Create an archive") }} {{ form.hidden_tag() }} + {{ input(form.name) }} {{ input(form.start_date) }} {{ input(form.end_date) }}
diff --git a/budget/web.py b/budget/web.py index 489874c7..af0a933a 100644 --- a/budget/web.py +++ b/budget/web.py @@ -389,7 +389,7 @@ def compute_bills(): return render_template("compute_bills.html") -@main.route("//archives/create") +@main.route("//archives/create", methods=["GET", "POST"]) def create_archive(): form = CreateArchiveForm() if request.method == "POST":