From 8d126e183f3803b0b6516837863abe7794e06d48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Mon, 6 Mar 2023 01:58:32 +0800 Subject: [PATCH] Changed the date field of the transaction forms to set the default value in the view, but not the form, so that the default value is not set when it did not receive a value. --- src/accounting/transaction/forms.py | 9 ++++++--- src/accounting/transaction/views.py | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/accounting/transaction/forms.py b/src/accounting/transaction/forms.py index c830879..904ab6c 100644 --- a/src/accounting/transaction/forms.py +++ b/src/accounting/transaction/forms.py @@ -574,7 +574,8 @@ class IncomeCurrencyForm(CurrencyForm): class IncomeTransactionForm(TransactionForm): """The form to create or edit a cash income transaction.""" - date = DateField(default=date.today()) + date = DateField( + validators=[DataRequired(lazy_gettext("Please fill in the date."))]) """The date.""" currencies = FieldList(FormField(IncomeCurrencyForm), name="currency", validators=[NeedSomeCurrencies()]) @@ -647,7 +648,8 @@ class ExpenseCurrencyForm(CurrencyForm): class ExpenseTransactionForm(TransactionForm): """The form to create or edit a cash expense transaction.""" - date = DateField(default=date.today()) + date = DateField( + validators=[DataRequired(lazy_gettext("Please fill in the date."))]) """The date.""" currencies = FieldList(FormField(ExpenseCurrencyForm), name="currency", validators=[NeedSomeCurrencies()]) @@ -756,7 +758,8 @@ class TransferCurrencyForm(CurrencyForm): class TransferTransactionForm(TransactionForm): """The form to create or edit a transfer transaction.""" - date = DateField(default=date.today()) + date = DateField( + validators=[DataRequired(lazy_gettext("Please fill in the date."))]) """The date.""" currencies = FieldList(FormField(TransferCurrencyForm), name="currency", validators=[NeedSomeCurrencies()]) diff --git a/src/accounting/transaction/views.py b/src/accounting/transaction/views.py index bb2f148..ac949b4 100644 --- a/src/accounting/transaction/views.py +++ b/src/accounting/transaction/views.py @@ -79,6 +79,7 @@ def show_add_transaction_form(txn_type: TransactionType) -> str: form.validate() else: form = txn_op.form() + form.date.data = date.today() return txn_op.render_create_template(form)