From 908fbedf0de21667826f6a54676061fdd5c87b6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= <imacat@mail.imacat.idv.tw>
Date: Sat, 8 Aug 2020 15:43:21 +0800
Subject: [PATCH] Renamed the URL transactions.show to transactions.detail, teh
 templates show.html to detail.html, and the view txn_show() to txn_detail, to
 follow the naming convention of Django in the accounting application.

---
 accounting/models.py                                   |  6 +++---
 accounting/templates/accounting/cash.html              |  4 ++--
 accounting/templates/accounting/journal.html           |  4 ++--
 accounting/templates/accounting/ledger.html            |  4 ++--
 accounting/templates/accounting/search.html            |  4 ++--
 .../transactions/expense/{view.html => detail.html}    |  4 ++--
 .../accounting/transactions/expense/form.html          |  2 +-
 .../transactions/income/{view.html => detail.html}     |  4 ++--
 .../templates/accounting/transactions/income/form.html |  2 +-
 accounting/templates/accounting/transactions/sort.html |  2 +-
 .../transactions/transfer/{view.html => detail.html}   |  0
 .../accounting/transactions/transfer/form.html         |  2 +-
 accounting/urls.py                                     |  2 +-
 accounting/views.py                                    | 10 +++++-----
 14 files changed, 25 insertions(+), 25 deletions(-)
 rename accounting/templates/accounting/transactions/expense/{view.html => detail.html} (98%)
 rename accounting/templates/accounting/transactions/income/{view.html => detail.html} (98%)
 rename accounting/templates/accounting/transactions/transfer/{view.html => detail.html} (100%)

diff --git a/accounting/models.py b/accounting/models.py
index c9e606c..018787b 100644
--- a/accounting/models.py
+++ b/accounting/models.py
@@ -156,13 +156,13 @@ class Transaction(DirtyFieldsMixin, models.Model):
         """Returns the URL to view this transaction."""
         if self.is_cash_expense:
             return reverse(
-                "accounting:transactions.show", args=("expense", self))
+                "accounting:transactions.detail", args=("expense", self))
         elif self.is_cash_income:
             return reverse(
-                "accounting:transactions.show", args=("income", self))
+                "accounting:transactions.detail", args=("income", self))
         else:
             return reverse(
-                "accounting:transactions.show", args=("transfer", self))
+                "accounting:transactions.detail", args=("transfer", self))
 
     def is_dirty(self, **kwargs):
         """Returns whether the data of this transaction is changed and need
diff --git a/accounting/templates/accounting/cash.html b/accounting/templates/accounting/cash.html
index 33d40b6..410a7c7 100644
--- a/accounting/templates/accounting/cash.html
+++ b/accounting/templates/accounting/cash.html
@@ -122,7 +122,7 @@ First written: 2020/7/1
           <td class="amount {% if record.balance < 0 %} text-danger {% endif %}">{{ record.balance|accounting_amount }}</td>
           <td class="actions">
             {% if record.pk is not None %}
-              <a href="{% url_with_return "accounting:transactions.show" record.transaction.type record.transaction %}" class="btn btn-info" role="button">
+              <a href="{% url_with_return "accounting:transactions.detail" record.transaction.type record.transaction %}" class="btn btn-info" role="button">
                 <i class="fas fa-eye"></i>
                 <span class="d-none d-lg-inline">{{ _("View")|force_escape }}</span>
               </a>
@@ -138,7 +138,7 @@ First written: 2020/7/1
     {% for record in record_list %}
       <li class="list-group-item {% if not record.is_balanced or record.has_order_hole %} list-group-item-danger {% endif %}">
         {% if record.pk is not None %}
-          <a class="list-group-item-action" href="{% url_with_return "accounting:transactions.show" record.transaction.type record.transaction %}">
+          <a class="list-group-item-action" href="{% url_with_return "accounting:transactions.detail" record.transaction.type record.transaction %}">
             <div class="date-account-line d-flex justify-content-between align-items-center">
               {{ record.transaction.date|smart_date }} {{ record.account.title|title_case }}
             </div>
diff --git a/accounting/templates/accounting/journal.html b/accounting/templates/accounting/journal.html
index 975002b..875e69a 100644
--- a/accounting/templates/accounting/journal.html
+++ b/accounting/templates/accounting/journal.html
@@ -102,7 +102,7 @@ First written: 2020/7/17
           <td>{{ record.transaction.note|default:"" }}</td>
           <td class="actions">
             {% if record.pk is not None %}
-              <a href="{% url_with_return "accounting:transactions.show" record.transaction.type record.transaction %}" class="btn btn-info" role="button">
+              <a href="{% url_with_return "accounting:transactions.detail" record.transaction.type record.transaction %}" class="btn btn-info" role="button">
                 <i class="fas fa-eye"></i>
                 {{ _("View")|force_escape }}
               </a>
@@ -118,7 +118,7 @@ First written: 2020/7/17
     {% for record in record_list %}
       <li class="list-group-item {% if not record.is_balanced or record.has_order_hole %} list-group-item-danger {% endif %}">
         {% if record.pk is not None %}
-          <a class="list-group-item-action" href="{% url_with_return "accounting:transactions.show" record.transaction.type record.transaction %}">
+          <a class="list-group-item-action" href="{% url_with_return "accounting:transactions.detail" record.transaction.type record.transaction %}">
             <div class="{% if record.is_credit %} journal-credit {% else %} journal-debit {% endif %}">
               <div class="date-account-line">
                 {{ record.transaction.date|smart_date }} {{ record.account.title|title_case }}
diff --git a/accounting/templates/accounting/ledger.html b/accounting/templates/accounting/ledger.html
index 4ba9375..041d055 100644
--- a/accounting/templates/accounting/ledger.html
+++ b/accounting/templates/accounting/ledger.html
@@ -123,7 +123,7 @@ First written: 2020/7/16
           <td class="amount {% if record.balance < 0 %} text-danger {% endif %}">{{ record.balance|accounting_amount }}</td>
           <td class="actions">
             {% if record.pk is not None %}
-              <a href="{% url_with_return "accounting:transactions.show" record.transaction.type record.transaction %}" class="btn btn-info" role="button">
+              <a href="{% url_with_return "accounting:transactions.detail" record.transaction.type record.transaction %}" class="btn btn-info" role="button">
                 <i class="fas fa-eye"></i>
                 <span class="d-none d-lg-inline">{{ _("View")|force_escape }}</span>
               </a>
@@ -139,7 +139,7 @@ First written: 2020/7/16
     {% for record in record_list %}
       <li class="list-group-item {% if not record.is_balanced or record.has_order_hole or record.is_payable %} list-group-item-danger {% endif %}{% if record.is_existing_equipment %} list-group-item-info {% endif %}">
         {% if record.pk is not None %}
-          <a class="list-group-item-action" href="{% url_with_return "accounting:transactions.show" record.transaction.type record.transaction %}">
+          <a class="list-group-item-action" href="{% url_with_return "accounting:transactions.detail" record.transaction.type record.transaction %}">
             <div class="date-account-line">
               {{ record.transaction.date|smart_date }} {{ record.account.title|title_case }}
             </div>
diff --git a/accounting/templates/accounting/search.html b/accounting/templates/accounting/search.html
index 75ef228..c8c36ae 100644
--- a/accounting/templates/accounting/search.html
+++ b/accounting/templates/accounting/search.html
@@ -100,7 +100,7 @@ First written: 2020/7/21
           <td class="amount">{{ record.credit_amount|accounting_amount }}</td>
           <td>{{ record.transaction.notes|default:"" }}</td>
           <td class="actions">
-            <a href="{% url_with_return "accounting:transactions.show" record.transaction.type record.transaction %}" class="btn btn-info" role="button">
+            <a href="{% url_with_return "accounting:transactions.detail" record.transaction.type record.transaction %}" class="btn btn-info" role="button">
               <i class="fas fa-eye"></i>
               {{ _("View")|force_escape }}
             </a>
@@ -114,7 +114,7 @@ First written: 2020/7/21
   <ul class="list-group d-md-none">
     {% for record in record_list %}
       <li class="list-group-item {% if not record.is_balanced or record.has_order_hole %} list-group-item-danger {% endif %}">
-        <a class="list-group-item-action" href="{% url_with_return "accounting:transactions.show" record.transaction.type record.transaction %}">
+        <a class="list-group-item-action" href="{% url_with_return "accounting:transactions.detail" record.transaction.type record.transaction %}">
           <div class="{% if record.is_credit %} journal-credit {% else %} journal-debit {% endif %}">
             <div class="date-account-line">
               {{ record.transaction.date|smart_date }} {{ record.account.title|title_case }}
diff --git a/accounting/templates/accounting/transactions/expense/view.html b/accounting/templates/accounting/transactions/expense/detail.html
similarity index 98%
rename from accounting/templates/accounting/transactions/expense/view.html
rename to accounting/templates/accounting/transactions/expense/detail.html
index 9a662e4..7539b60 100644
--- a/accounting/templates/accounting/transactions/expense/view.html
+++ b/accounting/templates/accounting/transactions/expense/detail.html
@@ -86,7 +86,7 @@ First written: 2020/7/23
       {{ _("Sort")|force_escape }}
     </a>
   {% endif %}
-  <a class="btn btn-primary d-none d-sm-inline" href="{% url_keep_return "accounting:transactions.show" "transfer" txn %}">
+  <a class="btn btn-primary d-none d-sm-inline" href="{% url_keep_return "accounting:transactions.detail" "transfer" txn %}">
     <i class="fas fa-exchange-alt"></i>
     {{ _("To Transfer")|force_escape }}
   </a>
@@ -106,7 +106,7 @@ First written: 2020/7/23
           {{ _("Sort")|force_escape }}
         </a>
       {% endif %}
-      <a class="dropdown-item" href="{% url_keep_return "accounting:transactions.show" "transfer" txn %}">
+      <a class="dropdown-item" href="{% url_keep_return "accounting:transactions.detail" "transfer" txn %}">
         <i class="fas fa-exchange-alt"></i>
         {{ _("To Transfer")|force_escape }}
       </a>
diff --git a/accounting/templates/accounting/transactions/expense/form.html b/accounting/templates/accounting/transactions/expense/form.html
index 7d0b1dd..32931de 100644
--- a/accounting/templates/accounting/transactions/expense/form.html
+++ b/accounting/templates/accounting/transactions/expense/form.html
@@ -46,7 +46,7 @@ First written: 2020/7/23
 {% endfor %}
 
 <div class="btn-group btn-actions">
-  <a class="btn btn-primary" role="button" href="{% if txn.transaction %}{% url_keep_return "accounting:transactions.show" "expense" txn.transaction %}{% elif request.GET.r %}{{ request.GET.r }}{% else %}{% url "accounting:home" %}{% endif %}">
+  <a class="btn btn-primary" role="button" href="{% if txn.transaction %}{% url_keep_return "accounting:transactions.detail" "expense" txn.transaction %}{% elif request.GET.r %}{{ request.GET.r }}{% else %}{% url "accounting:home" %}{% endif %}">
     <i class="fas fa-chevron-circle-left"></i>
     {{ _("Back")|force_escape }}
   </a>
diff --git a/accounting/templates/accounting/transactions/income/view.html b/accounting/templates/accounting/transactions/income/detail.html
similarity index 98%
rename from accounting/templates/accounting/transactions/income/view.html
rename to accounting/templates/accounting/transactions/income/detail.html
index f7c27ec..0d51790 100644
--- a/accounting/templates/accounting/transactions/income/view.html
+++ b/accounting/templates/accounting/transactions/income/detail.html
@@ -86,7 +86,7 @@ First written: 2020/7/23
       {{ _("Sort")|force_escape }}
     </a>
   {% endif %}
-  <a class="btn btn-primary d-none d-sm-inline" href="{% url_keep_return "accounting:transactions.show" "transfer" txn %}">
+  <a class="btn btn-primary d-none d-sm-inline" href="{% url_keep_return "accounting:transactions.detail" "transfer" txn %}">
     <i class="fas fa-exchange-alt"></i>
     {{ _("To Transfer")|force_escape }}
   </a>
@@ -106,7 +106,7 @@ First written: 2020/7/23
           {{ _("Sort")|force_escape }}
         </a>
       {% endif %}
-      <a class="dropdown-item" href="{% url_keep_return "accounting:transactions.show" "transfer" txn %}">
+      <a class="dropdown-item" href="{% url_keep_return "accounting:transactions.detail" "transfer" txn %}">
         <i class="fas fa-exchange-alt"></i>
         {{ _("To Transfer")|force_escape }}
       </a>
diff --git a/accounting/templates/accounting/transactions/income/form.html b/accounting/templates/accounting/transactions/income/form.html
index e7f4bbb..c8657d4 100644
--- a/accounting/templates/accounting/transactions/income/form.html
+++ b/accounting/templates/accounting/transactions/income/form.html
@@ -46,7 +46,7 @@ First written: 2020/7/23
 {% endfor %}
 
 <div class="btn-group btn-actions">
-  <a class="btn btn-primary" role="button" href="{% if txn.transaction %}{% url_keep_return "accounting:transactions.show" "income" txn.transaction %}{% elif request.GET.r %}{{ request.GET.r }}{% else %}{% url "accounting:home" %}{% endif %}">
+  <a class="btn btn-primary" role="button" href="{% if txn.transaction %}{% url_keep_return "accounting:transactions.detail" "income" txn.transaction %}{% elif request.GET.r %}{{ request.GET.r }}{% else %}{% url "accounting:home" %}{% endif %}">
     <i class="fas fa-chevron-circle-left"></i>
     {{ _("Back")|force_escape }}
   </a>
diff --git a/accounting/templates/accounting/transactions/sort.html b/accounting/templates/accounting/transactions/sort.html
index 62bea9f..017aee2 100644
--- a/accounting/templates/accounting/transactions/sort.html
+++ b/accounting/templates/accounting/transactions/sort.html
@@ -75,7 +75,7 @@ First written: 2020/8/6
                 <button class="btn btn-outline-secondary" type="button">
                   <i class="fas fa-sort"></i>
                 </button>
-                <a class="btn btn-primary" role="button" href="{% url_with_return "accounting:transactions.show" txn.type txn %}">
+                <a class="btn btn-primary" role="button" href="{% url_with_return "accounting:transactions.detail" txn.type txn %}">
                   <i class="fas fa-eye"></i>
                 </a>
               </div>
diff --git a/accounting/templates/accounting/transactions/transfer/view.html b/accounting/templates/accounting/transactions/transfer/detail.html
similarity index 100%
rename from accounting/templates/accounting/transactions/transfer/view.html
rename to accounting/templates/accounting/transactions/transfer/detail.html
diff --git a/accounting/templates/accounting/transactions/transfer/form.html b/accounting/templates/accounting/transactions/transfer/form.html
index d83718e..fda1c41 100644
--- a/accounting/templates/accounting/transactions/transfer/form.html
+++ b/accounting/templates/accounting/transactions/transfer/form.html
@@ -46,7 +46,7 @@ First written: 2020/7/23
 {% endfor %}
 
 <div class="btn-group btn-actions">
-  <a class="btn btn-primary" role="button" href="{% if txn.transaction %}{% url_keep_return "accounting:transactions.show" "transfer" txn.transaction %}{% elif request.GET.r %}{{ request.GET.r }}{% else %}{% url "accounting:home" %}{% endif %}">
+  <a class="btn btn-primary" role="button" href="{% if txn.transaction %}{% url_keep_return "accounting:transactions.detail" "transfer" txn.transaction %}{% elif request.GET.r %}{{ request.GET.r }}{% else %}{% url "accounting:home" %}{% endif %}">
     <i class="fas fa-chevron-circle-left"></i>
     {{ _("Back")|force_escape }}
   </a>
diff --git a/accounting/urls.py b/accounting/urls.py
index 939928b..9c0c150 100644
--- a/accounting/urls.py
+++ b/accounting/urls.py
@@ -81,7 +81,7 @@ urlpatterns = [
     path("transactions/<txn-type:txn_type>/store",
          views.txn_store, name="transactions.store"),
     path("transactions/<txn-type:txn_type>/<txn:txn>",
-         views.txn_show, name="transactions.show"),
+         views.txn_detail, name="transactions.detail"),
     path("transactions/<txn-type:txn_type>/<txn:txn>/edit",
          views.txn_edit, name="transactions.edit"),
     path("transactions/<txn-type:txn_type>/<txn:txn>/update",
diff --git a/accounting/views.py b/accounting/views.py
index 6e25b94..187d872 100644
--- a/accounting/views.py
+++ b/accounting/views.py
@@ -801,8 +801,8 @@ def search(request):
 
 @require_GET
 @login_required
-def txn_show(request, txn_type, txn):
-    """The view of an accounting transaction.
+def txn_detail(request, txn_type, txn):
+    """The view of the details of an accounting transaction.
 
     Args:
         request (HttpRequest): The request.
@@ -812,7 +812,7 @@ def txn_show(request, txn_type, txn):
     Returns:
         HttpResponse: The response.
     """
-    return render(request, F"accounting/transactions/{txn_type}/view.html", {
+    return render(request, F"accounting/transactions/{txn_type}/detail.html", {
         "txn": txn,
     })
 
@@ -893,7 +893,7 @@ def txn_store(request, txn_type, txn=None):
     if not txn.is_dirty():
         messages.success(request, gettext_noop(
             "This transaction was not modified."))
-        url = reverse("accounting:transactions.show", args=(txn_type, txn))
+        url = reverse("accounting:transactions.detail", args=(txn_type, txn))
         url = str(UrlBuilder(url).query(r=request.GET.get("r")))
         return HttpResponseRedirect(url)
 
@@ -940,7 +940,7 @@ def txn_store(request, txn_type, txn=None):
             x.save()
     messages.success(request, gettext_noop(
         "This transaction was saved successfully."))
-    url = reverse("accounting:transactions.show", args=(txn_type, txn))
+    url = reverse("accounting:transactions.detail", args=(txn_type, txn))
     url = str(UrlBuilder(url).query(r=request.GET.get("r")))
     return HttpResponseRedirect(url)