Use Django 1.5 URL syntax in templates

django-oscar · Nov 4, 2013 · 4a199b9 · 4a199b9
1 parent d489dd7
commit 4a199b9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/datacash/templates/datacash/dashboard/fraudresponse_list.html b/datacash/templates/datacash/dashboard/fraudresponse_list.html
@@ -1,5 +1,6 @@
 {% extends 'dashboard/layout.html' %}
 {% load currency_filters %}
+{% load url from future %}
 {% load i18n %}
 
 {% block title %}
@@ -9,7 +10,7 @@
 {% block breadcrumbs %}
     <ul class="breadcrumb">
         <li>
-            <a href="{% url dashboard:index %}">{% trans "Dashboard" %}</a>
+            <a href="{% url 'dashboard:index' %}">{% trans "Dashboard" %}</a>
             <span class="divider">/</span>
         </li>
         <li class="active">{% trans "Fraud responses" %}</li>
@@ -41,7 +42,7 @@
                 <tr {% if r.released %}class="success"{% elif r.on_hold %}class="warning"{% else %}class="error"{% endif %}>
                     <td>{{ r.t3m_id }}</td>
                     <td>{{ r.merchant_order_ref }}</td>
-                    <td><a href="{% url dashboard:order-detail r.order_number %}">{{ r.order_number }}</a></td>
+                    <td><a href="{% url 'dashboard:order-detail' r.order_number %}">{{ r.order_number }}</a></td>
                     <td>{{ r.aggregator_identifier|default:"-" }}</td>
                     <td>{{ r.merchant_identifier }}</td>
                     <td>{{ r.score }}</td>

diff --git a/datacash/templates/datacash/dashboard/transaction_detail.html b/datacash/templates/datacash/dashboard/transaction_detail.html
@@ -1,4 +1,5 @@
 {% extends 'dashboard/layout.html' %}
+{% from url from future %}
 {% load i18n %}
 
 {% block title %}
@@ -8,11 +9,11 @@
 {% block breadcrumbs %}
 <ul class="breadcrumb">
     <li>
-        <a href="{% url dashboard:index %}">{% trans "Dashboard" %}</a>
+        <a href="{% url 'dashboard:index' %}">{% trans "Dashboard" %}</a>
         <span class="divider">/</span>
     </li>
     <li>
-        <a href="{% url datacash-transaction-list %}">{% trans "Datacash" %}</a>
+        <a href="{% url 'datacash-transaction-list' %}">{% trans "Datacash" %}</a>
         <span class="divider">/</span>
     </li>
 	<li class="active">{{ txn.datacash_reference }}</li>

diff --git a/datacash/templates/datacash/dashboard/transaction_list.html b/datacash/templates/datacash/dashboard/transaction_list.html
@@ -1,4 +1,5 @@
 {% extends 'dashboard/layout.html' %}
+{% load url from future %}
 {% load i18n %}
 
 {% block title %}
@@ -8,7 +9,7 @@
 {% block breadcrumbs %}
 <ul class="breadcrumb">
     <li>
-        <a href="{% url dashboard:index %}">{% trans "Dashboard" %}</a>
+        <a href="{% url 'dashboard:index' %}">{% trans "Dashboard" %}</a>
         <span class="divider">/</span>
     </li>
     <li class="active">{% trans "Datacash transactions" %}</li>
@@ -40,7 +41,7 @@
             <tbody>
             {% for txn in transactions %}
             <tr {% if txn.accepted %}class="success"{% elif txn.declined %}class="info"{% else %}class="error"{% endif %}>
-                <td><a href="{% url datacash-transaction-detail txn.pk %}">{{ txn.datacash_reference }}</a></td>
+                <td><a href="{% url 'datacash-transaction-detail' txn.pk %}">{{ txn.datacash_reference }}</a></td>
                 <td>{{ txn.order_number }}</td>
                 <td>{{ txn.method }}</td>
                 <td>{{ txn.amount }}</td>
@@ -51,7 +52,7 @@
                 <td>{{ txn.reason }}</td>
                 <td>{{ txn.date_created }}</td>
                 <td>
-                    <a href="{% url datacash-transaction-detail txn.pk %}" class="btn btn-info">{% trans "View" %}</a>
+                    <a href="{% url 'datacash-transaction-detail' txn.pk %}" class="btn btn-info">{% trans "View" %}</a>
                 </td>
             </tr>
             {% endfor %}