Changeset 695d358 for remit/remit_templates/vouchers

Timestamp:

Jun 15, 2014, 10:06:46 PM (11 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master

Children:

6479b5c

Parents:

2e4e1fb

git-author:

Alex Dehnert <adehnert@…> (06/15/14 21:36:47)

git-committer:

Alex Dehnert <adehnert@…> (06/15/14 22:06:46)

Message:

Django 1.6: use new {% url %} syntax

Starting in Django 1.5, the argument to {% url %} is treated as a variable,
rather than a literal. To get a literal, we need to enclose the argument in
quotes. For Django 1.4 support, we also want to do {% load url from future %}
-- probably in more places than just base.html, but we'll see.

Location:

remit/remit_templates/vouchers

Files:

• ReimbursementRequest_review.html (modified) (2 diffs)
• reimbursementrequest_list.html (modified) (2 diffs)

remit/remit_templates/vouchers/ReimbursementRequest_review.html

@@ -1 +1 @@
 {% extends "base.html" %}
+{% load url from future %}
 {% load misc %}
 
@@ -123 +124 @@
 {% else %}
 {% if perms.vouchers.change_reimbursementrequest %}
-<p>Optionally, <a href='{% url admin:vouchers_reimbursementrequest_change rr.pk %}'>change this request first</a>.</p>
+<p>Optionally, <a href='{% url "admin:vouchers_reimbursementrequest_change" rr.pk %}'>change this request first</a>.</p>
 {% endif %}
 <form method="post" action="">

remit/remit_templates/vouchers/reimbursementrequest_list.html

@@ -1 +1 @@
 {% extends "base.html" %}
+{% load url from future %}
 {% load misc %}
 
@@ -58 +59 @@
     <td>
         <input type='checkbox' name='select' value='{{object.pk}}'{%ifin object.pk selected_ids %} checked='checked'{%endifin%}></input>
-        <a href='{% url review_request object.pk %}'>{{ object.pk }}</a>
+        <a href='{% url "review_request" object.pk %}'>{{ object.pk }}</a>
     </td>
     <td>
-        <em><a href='{% url review_request object.pk %}'>{{ object.name }}</a></em>
+        <em><a href='{% url "review_request" object.pk %}'>{{ object.name }}</a></em>
         {% if object.documentation %}<br /><a href='{{object.documentation.backing_file.url}}'>(view docs)</a>{%endif%}
     </td>