From 8f0a80d322e42d226c33fa2a568a8ddf86c1a6fc Mon Sep 17 00:00:00 2001
From: Darrell Enns <darrell@darrellenns.com>
Date: Mon, 18 Mar 2013 11:41:43 -0700
Subject: [PATCH] added url tag compatibility fix for django <1.5 added django
 1.5 to travis

---
 .travis.yml                                            | 1 +
 helpdesk/templates/helpdesk/base.html                  | 1 +
 helpdesk/templates/helpdesk/dashboard.html             | 2 +-
 helpdesk/templates/helpdesk/email_ignore_list.html     | 2 +-
 helpdesk/templates/helpdesk/help_api.html              | 2 +-
 helpdesk/templates/helpdesk/help_base.html             | 1 +
 helpdesk/templates/helpdesk/navigation.html            | 2 +-
 helpdesk/templates/helpdesk/public_base.html           | 2 +-
 helpdesk/templates/helpdesk/public_homepage.html       | 2 +-
 helpdesk/templates/helpdesk/public_view_form.html      | 2 +-
 helpdesk/templates/helpdesk/registration/login.html    | 2 +-
 helpdesk/templates/helpdesk/rss_list.html              | 2 +-
 helpdesk/templates/helpdesk/system_settings.html       | 2 +-
 helpdesk/templates/helpdesk/ticket.html                | 2 +-
 helpdesk/templates/helpdesk/ticket_cc_add.html         | 2 +-
 helpdesk/templates/helpdesk/ticket_cc_del.html         | 2 +-
 helpdesk/templates/helpdesk/ticket_cc_list.html        | 2 +-
 helpdesk/templates/helpdesk/ticket_dependency_add.html | 2 +-
 helpdesk/templates/helpdesk/ticket_dependency_del.html | 2 +-
 helpdesk/templates/helpdesk/ticket_desc_table.html     | 2 +-
 helpdesk/templates/helpdesk/ticket_list.html           | 2 +-
 helpdesk/templates/helpdesk/user_settings.html         | 2 +-
 22 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cf3e3968..7846c696 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ python:
 env:
     - DJANGO=1.4.3
     - DJANGO=1.3.5
+    - DJANGO=1.5.0
 install:
     - pip install argparse --use-mirrors
     - pip install -q Django==$DJANGO --use-mirrors
diff --git a/helpdesk/templates/helpdesk/base.html b/helpdesk/templates/helpdesk/base.html
index 3d276d65..c4732afd 100644
--- a/helpdesk/templates/helpdesk/base.html
+++ b/helpdesk/templates/helpdesk/base.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load url from future %}
 {% load saved_queries %}
 {% load load_helpdesk_settings %}
 {% with request|load_helpdesk_settings as helpdesk_settings %}
diff --git a/helpdesk/templates/helpdesk/dashboard.html b/helpdesk/templates/helpdesk/dashboard.html
index 5423590f..ef2f9082 100644
--- a/helpdesk/templates/helpdesk/dashboard.html
+++ b/helpdesk/templates/helpdesk/dashboard.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/base.html" %}{% load i18n %}
+{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
 {% block helpdesk_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk Dashboard" %}{% endblock %}
 {% block helpdesk_head %}
 <script type='text/javascript' language='javascript' src='{{ STATIC_URL }}helpdesk/hover.js'></script>
diff --git a/helpdesk/templates/helpdesk/email_ignore_list.html b/helpdesk/templates/helpdesk/email_ignore_list.html
index 3ef75c4d..f72286e2 100644
--- a/helpdesk/templates/helpdesk/email_ignore_list.html
+++ b/helpdesk/templates/helpdesk/email_ignore_list.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/base.html" %}{% load i18n %}
+{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
 
 {% block helpdesk_title %}{% trans "Ignored E-Mail Addresses" %}{% endblock %}
 
diff --git a/helpdesk/templates/helpdesk/help_api.html b/helpdesk/templates/helpdesk/help_api.html
index bcb7cb92..888992f2 100644
--- a/helpdesk/templates/helpdesk/help_api.html
+++ b/helpdesk/templates/helpdesk/help_api.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/help_base.html" %}
+{% extends "helpdesk/help_base.html" %}{% load url from future %}
 
 {% block title %}django-helpdesk API Documentation{% endblock %}
 {% block heading %}django-helpdesk API Documentation{% endblock %}
diff --git a/helpdesk/templates/helpdesk/help_base.html b/helpdesk/templates/helpdesk/help_base.html
index 03dbee2b..11903d2d 100644
--- a/helpdesk/templates/helpdesk/help_base.html
+++ b/helpdesk/templates/helpdesk/help_base.html
@@ -1,3 +1,4 @@
+{% load url from future %}
 <html>
     <head>
         <style type='text/css'>
diff --git a/helpdesk/templates/helpdesk/navigation.html b/helpdesk/templates/helpdesk/navigation.html
index 6cdb637e..3231c42d 100644
--- a/helpdesk/templates/helpdesk/navigation.html
+++ b/helpdesk/templates/helpdesk/navigation.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n %}{% load url from future %}
 {% if helpdesk_settings.HELPDESK_NAVIGATION_ENABLED and user.is_authenticated or user.is_staff %}
 <ul id="dropdown">
     <li><a href='{% url 'helpdesk_dashboard' %}'>{% trans "Dashboard" %}</a></li>
diff --git a/helpdesk/templates/helpdesk/public_base.html b/helpdesk/templates/helpdesk/public_base.html
index 887656f6..138329ba 100644
--- a/helpdesk/templates/helpdesk/public_base.html
+++ b/helpdesk/templates/helpdesk/public_base.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n %}{% load url from future %}
 {% load load_helpdesk_settings %}
 {% with request|load_helpdesk_settings as helpdesk_settings %}
 <html>
diff --git a/helpdesk/templates/helpdesk/public_homepage.html b/helpdesk/templates/helpdesk/public_homepage.html
index bf0c1510..d27beb01 100644
--- a/helpdesk/templates/helpdesk/public_homepage.html
+++ b/helpdesk/templates/helpdesk/public_homepage.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/public_base.html" %}{% load i18n %}
+{% extends "helpdesk/public_base.html" %}{% load i18n %}{% load url from future %}
 
 {% block helpdesk_body %}
 
diff --git a/helpdesk/templates/helpdesk/public_view_form.html b/helpdesk/templates/helpdesk/public_view_form.html
index 74b63f42..debfec09 100644
--- a/helpdesk/templates/helpdesk/public_view_form.html
+++ b/helpdesk/templates/helpdesk/public_view_form.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/public_base.html" %}{% load i18n %}
+{% extends "helpdesk/public_base.html" %}{% load i18n %}{% load url from future %}
 
 {% block helpdesk_body %}
 <h2>{% trans "View a Ticket" %}</h2>
diff --git a/helpdesk/templates/helpdesk/registration/login.html b/helpdesk/templates/helpdesk/registration/login.html
index 9cc540fb..870fcfb9 100644
--- a/helpdesk/templates/helpdesk/registration/login.html
+++ b/helpdesk/templates/helpdesk/registration/login.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/public_base.html" %}{% load i18n %}
+{% extends "helpdesk/public_base.html" %}{% load i18n %}{% load url from future %}
 {% block helpdesk_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk Login" %}{% endblock %}
 
 {% block helpdesk_body %}
diff --git a/helpdesk/templates/helpdesk/rss_list.html b/helpdesk/templates/helpdesk/rss_list.html
index 4bdbac52..e27144e6 100644
--- a/helpdesk/templates/helpdesk/rss_list.html
+++ b/helpdesk/templates/helpdesk/rss_list.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/base.html" %}{% load i18n %}
+{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
 {% block helpdesk_title %}{% trans "RSS Feeds" %}{% endblock %}
 {% block helpdesk_body %}
 <h2>{% trans "RSS Feeds" %}</h2>
diff --git a/helpdesk/templates/helpdesk/system_settings.html b/helpdesk/templates/helpdesk/system_settings.html
index 44d52f74..629fd5bc 100644
--- a/helpdesk/templates/helpdesk/system_settings.html
+++ b/helpdesk/templates/helpdesk/system_settings.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/base.html" %}{% load i18n %}
+{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
 
 {% block helpdesk_title %}{% trans "Change System Settings" %}{% endblock %}
 
diff --git a/helpdesk/templates/helpdesk/ticket.html b/helpdesk/templates/helpdesk/ticket.html
index 109dd3fc..1b678dac 100644
--- a/helpdesk/templates/helpdesk/ticket.html
+++ b/helpdesk/templates/helpdesk/ticket.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/base.html" %}{% load i18n %}
+{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
 {% block helpdesk_title %}{% trans "View Ticket Details" %}{% endblock %}
 {% block helpdesk_head %}
 <script type="text/javascript">
diff --git a/helpdesk/templates/helpdesk/ticket_cc_add.html b/helpdesk/templates/helpdesk/ticket_cc_add.html
index 353e6f16..e10f4bf1 100644
--- a/helpdesk/templates/helpdesk/ticket_cc_add.html
+++ b/helpdesk/templates/helpdesk/ticket_cc_add.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/base.html" %}{% load i18n %}
+{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
 
 {% block helpdesk_title %}{% trans "Add Ticket CC" %}{% endblock %}
 
diff --git a/helpdesk/templates/helpdesk/ticket_cc_del.html b/helpdesk/templates/helpdesk/ticket_cc_del.html
index 85cfc322..8b63a2e0 100644
--- a/helpdesk/templates/helpdesk/ticket_cc_del.html
+++ b/helpdesk/templates/helpdesk/ticket_cc_del.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/base.html" %}{% load i18n %}
+{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
 
 {% block helpdesk_title %}{% trans "Delete Ticket CC" %}{% endblock %}
 
diff --git a/helpdesk/templates/helpdesk/ticket_cc_list.html b/helpdesk/templates/helpdesk/ticket_cc_list.html
index 9f043fb2..5f501a48 100644
--- a/helpdesk/templates/helpdesk/ticket_cc_list.html
+++ b/helpdesk/templates/helpdesk/ticket_cc_list.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/base.html" %}{% load i18n %}
+{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
 
 {% block helpdesk_title %}{% trans "Ticket CC Settings" %}{% endblock %}
 
diff --git a/helpdesk/templates/helpdesk/ticket_dependency_add.html b/helpdesk/templates/helpdesk/ticket_dependency_add.html
index 93df3fb4..d8514517 100644
--- a/helpdesk/templates/helpdesk/ticket_dependency_add.html
+++ b/helpdesk/templates/helpdesk/ticket_dependency_add.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/base.html" %}{% load i18n %}
+{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
 
 {% block helpdesk_title %}{% trans "Add Ticket Dependency" %}{% endblock %}
 
diff --git a/helpdesk/templates/helpdesk/ticket_dependency_del.html b/helpdesk/templates/helpdesk/ticket_dependency_del.html
index 2a2c99f2..550fbaca 100644
--- a/helpdesk/templates/helpdesk/ticket_dependency_del.html
+++ b/helpdesk/templates/helpdesk/ticket_dependency_del.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/base.html" %}{% load i18n %}
+{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
 
 {% block helpdesk_title %}{% trans "Delete Ticket Dependency" %}{% endblock %}
 
diff --git a/helpdesk/templates/helpdesk/ticket_desc_table.html b/helpdesk/templates/helpdesk/ticket_desc_table.html
index 68ce8a41..f6fb5809 100644
--- a/helpdesk/templates/helpdesk/ticket_desc_table.html
+++ b/helpdesk/templates/helpdesk/ticket_desc_table.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n %}{% load url from future %}
 <table width='100%'>
     <tr class='row_tablehead'><td colspan='2'>{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}] <span class='ticket_toolbar'>
     {% if helpdesk_settings.HELPDESK_SHOW_EDIT_BUTTON_TICKET_TOP %}
diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html
index a6a1920c..f8fb055a 100644
--- a/helpdesk/templates/helpdesk/ticket_list.html
+++ b/helpdesk/templates/helpdesk/ticket_list.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/base.html" %}{% load i18n %}
+{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
 {% block helpdesk_title %}{% trans "Ticket Listing" %}{% endblock %}
 {% block helpdesk_head %}
 <script type='text/javascript' language='javascript' src='{{ STATIC_URL }}helpdesk/filter.js'></script>
diff --git a/helpdesk/templates/helpdesk/user_settings.html b/helpdesk/templates/helpdesk/user_settings.html
index 60ed8d50..96592b7a 100644
--- a/helpdesk/templates/helpdesk/user_settings.html
+++ b/helpdesk/templates/helpdesk/user_settings.html
@@ -1,4 +1,4 @@
-{% extends "helpdesk/base.html" %}{% load i18n %}
+{% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %}
 
 {% block helpdesk_title %}{% trans "Change User Settings" %}{% endblock %}