From 1c44d51e9290d265db9d009fb63d3c553201791d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Mon, 5 Dec 2022 19:27:53 +0800 Subject: [PATCH] Renamed the "order" property to "ord" in the TransactionSortForm.Order class. --- src/accounting/forms.py | 6 +++--- src/accounting/views.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/accounting/forms.py b/src/accounting/forms.py index 3650f7e..fa0cce6 100644 --- a/src/accounting/forms.py +++ b/src/accounting/forms.py @@ -479,7 +479,7 @@ class TransactionSortForm(forms.Form): post_orders.append(form.Order(txn, 9999)) else: post_orders.append(form.Order(txn, int(post[key]))) - post_orders.sort(key=lambda x: (x.order, x.txn.ord)) + post_orders.sort(key=lambda x: (x.ord, x.txn.ord)) form.txn_orders = [] for i in range(len(post_orders)): form.txn_orders.append(form.Order(post_orders[i].txn, i + 1)) @@ -488,9 +488,9 @@ class TransactionSortForm(forms.Form): class Order: """A transaction order""" - def __init__(self, txn: Transaction, order: int): + def __init__(self, txn: Transaction, ord: int): self.txn = txn - self.order = order + self.ord = ord class AccountForm(forms.Form): diff --git a/src/accounting/views.py b/src/accounting/views.py index 4de2185..537b285 100644 --- a/src/accounting/views.py +++ b/src/accounting/views.py @@ -1086,13 +1086,13 @@ class TransactionSortFormView(FormView): def form_valid(self, form: TransactionSortForm) -> HttpResponseRedirect: """Handles the action when the POST form is valid.""" - modified = [x for x in form.txn_orders if x.txn.ord != x.order] + modified = [x for x in form.txn_orders if x.txn.ord != x.ord] if len(modified) == 0: message = self.get_not_modified_message(form.cleaned_data) else: with transaction.atomic(): for x in modified: - Transaction.objects.filter(pk=x.txn.pk).update(ord=x.order) + Transaction.objects.filter(pk=x.txn.pk).update(ord=x.ord) message = self.get_success_message(form.cleaned_data) messages.success(self.request, message) return redirect(self.get_success_url())