Replaced HttpResponseRedirect with the redirect() shortcut.

This commit is contained in:
依瑪貓 2020-08-09 19:05:57 +08:00
parent 550e44d93a
commit 828e407c03
2 changed files with 16 additions and 21 deletions

View File

@ -27,7 +27,7 @@ from django.db import transaction
from django.db.models import Sum, Case, When, F, Q, Max, Count, BooleanField from django.db.models import Sum, Case, When, F, Q, Max, Count, BooleanField
from django.db.models.functions import TruncMonth, Coalesce, Now from django.db.models.functions import TruncMonth, Coalesce, Now
from django.http import JsonResponse, HttpResponseRedirect, Http404 from django.http import JsonResponse, HttpResponseRedirect, Http404
from django.shortcuts import render from django.shortcuts import render, redirect
from django.template.loader import render_to_string from django.template.loader import render_to_string
from django.urls import reverse from django.urls import reverse
from django.utils import timezone from django.utils import timezone
@ -155,7 +155,7 @@ def cash(request, account, period):
try: try:
pagination = Pagination(request, records, True) pagination = Pagination(request, records, True)
except PaginationException as e: except PaginationException as e:
return HttpResponseRedirect(e.url) return redirect(e.url)
records = pagination.items records = pagination.items
find_imbalanced(records) find_imbalanced(records)
find_order_holes(records) find_order_holes(records)
@ -257,7 +257,7 @@ def cash_summary(request, account):
try: try:
pagination = Pagination(request, months, True) pagination = Pagination(request, months, True)
except PaginationException as e: except PaginationException as e:
return HttpResponseRedirect(e.url) return redirect(e.url)
shortcut_accounts = settings.ACCOUNTING["CASH_SHORTCUT_ACCOUNTS"] shortcut_accounts = settings.ACCOUNTING["CASH_SHORTCUT_ACCOUNTS"]
return render(request, "accounting/cash-summary.html", { return render(request, "accounting/cash-summary.html", {
"month_list": pagination.items, "month_list": pagination.items,
@ -334,7 +334,7 @@ def ledger(request, account, period):
try: try:
pagination = Pagination(request, records, True) pagination = Pagination(request, records, True)
except PaginationException as e: except PaginationException as e:
return HttpResponseRedirect(e.url) return redirect(e.url)
records = pagination.items records = pagination.items
find_imbalanced(records) find_imbalanced(records)
find_order_holes(records) find_order_holes(records)
@ -402,7 +402,7 @@ def ledger_summary(request, account):
try: try:
pagination = Pagination(request, months, True) pagination = Pagination(request, months, True)
except PaginationException as e: except PaginationException as e:
return HttpResponseRedirect(e.url) return redirect(e.url)
return render(request, "accounting/ledger-summary.html", { return render(request, "accounting/ledger-summary.html", {
"month_list": pagination.items, "month_list": pagination.items,
"pagination": pagination, "pagination": pagination,
@ -485,7 +485,7 @@ def journal(request, period):
try: try:
pagination = Pagination(request, records, True) pagination = Pagination(request, records, True)
except PaginationException as e: except PaginationException as e:
return HttpResponseRedirect(e.url) return redirect(e.url)
return render(request, "accounting/journal.html", { return render(request, "accounting/journal.html", {
"record_list": pagination.items, "record_list": pagination.items,
"pagination": pagination, "pagination": pagination,
@ -794,7 +794,7 @@ def search(request):
try: try:
pagination = Pagination(request, records, True) pagination = Pagination(request, records, True)
except PaginationException as e: except PaginationException as e:
return HttpResponseRedirect(e.url) return redirect(e.url)
return render(request, "accounting/search.html", { return render(request, "accounting/search.html", {
"record_list": pagination.items, "record_list": pagination.items,
"pagination": pagination, "pagination": pagination,
@ -892,8 +892,7 @@ def txn_store(request, txn_type, txn=None):
messages.success(request, gettext_noop( messages.success(request, gettext_noop(
"This transaction was not modified.")) "This transaction was not modified."))
url = reverse("accounting:transactions.detail", args=(txn_type, txn)) url = reverse("accounting:transactions.detail", args=(txn_type, txn))
url = str(UrlBuilder(url).query(r=request.GET.get("r"))) return redirect(str(UrlBuilder(url).query(r=request.GET.get("r"))))
return HttpResponseRedirect(url)
# Prepares the data # Prepares the data
user = request.user user = request.user
@ -939,8 +938,7 @@ def txn_store(request, txn_type, txn=None):
messages.success(request, gettext_noop( messages.success(request, gettext_noop(
"This transaction was saved successfully.")) "This transaction was saved successfully."))
url = reverse("accounting:transactions.detail", args=(txn_type, txn)) url = reverse("accounting:transactions.detail", args=(txn_type, txn))
url = str(UrlBuilder(url).query(r=request.GET.get("r"))) return redirect(str(UrlBuilder(url).query(r=request.GET.get("r"))))
return HttpResponseRedirect(url)
@method_decorator(require_POST, name="dispatch") @method_decorator(require_POST, name="dispatch")
@ -1004,16 +1002,14 @@ def txn_sort(request, date):
if len(modified) == 0: if len(modified) == 0:
messages.success(request, gettext_noop( messages.success(request, gettext_noop(
"The transaction orders were not modified.")) "The transaction orders were not modified."))
url = request.GET.get("r") or reverse("accounting:home") return redirect(request.GET.get("r") or reverse("accounting:home"))
return HttpResponseRedirect(url)
with transaction.atomic(): with transaction.atomic():
for txn in modified: for txn in modified:
txn.save() txn.save()
messages.success(request, gettext_noop( messages.success(request, gettext_noop(
"The transaction orders were saved successfully.")) "The transaction orders were saved successfully."))
url = request.GET.get("r") or reverse("accounting:home") return redirect(request.GET.get("r") or reverse("accounting:home"))
return HttpResponseRedirect(url)
@method_decorator(require_GET, name="dispatch") @method_decorator(require_GET, name="dispatch")
@ -1091,8 +1087,7 @@ def account_store(request, account=None):
account.save(current_user=request.user) account.save(current_user=request.user)
message = gettext_noop("This account was saved successfully.") message = gettext_noop("This account was saved successfully.")
messages.success(request, message) messages.success(request, message)
return HttpResponseRedirect(reverse("accounting:accounts.detail", return redirect("accounting:accounts.detail", account)
args=(account,)))
@require_POST @require_POST
@ -1110,12 +1105,11 @@ def account_delete(request, account):
if account.is_in_use: if account.is_in_use:
message = gettext_noop("This account is in use.") message = gettext_noop("This account is in use.")
messages.error(request, message) messages.error(request, message)
return HttpResponseRedirect(reverse("accounting:accounts.detail", return redirect("accounting:accounts.detail", account)
args=(account,)))
account.delete() account.delete()
message = gettext_noop("This account was deleted successfully.") message = gettext_noop("This account was deleted successfully.")
messages.success(request, message) messages.success(request, message)
return HttpResponseRedirect(reverse("accounting:accounts")) return redirect("accounting:accounts")
@require_GET @require_GET

View File

@ -21,6 +21,7 @@
import random import random
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import redirect
from .utils import UrlBuilder from .utils import UrlBuilder
@ -41,7 +42,7 @@ def error_redirect(request, url, post):
HttpResponseRedirect: The redirect response. HttpResponseRedirect: The redirect response.
""" """
post_id = _store(request, post) post_id = _store(request, post)
return HttpResponseRedirect(str(UrlBuilder(url).query(s=post_id))) return redirect(str(UrlBuilder(url).query(s=post_id)))
def get_previous_post(request): def get_previous_post(request):