added url tag compatibility fix for django <1.5

added django 1.5 to travis
2013-03-18 11:41:43 -07:00 · 2013-03-18 11:41:43 -07:00 · 8f0a80d322
commit 8f0a80d322
parent ca1c6a270c
22 changed files with 22 additions and 19 deletions
--- 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
--- 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 %}
--- 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>
--- 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 %}

--- 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 %}
--- 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'>
--- 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>
--- 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>
--- 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 %}

--- 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>
--- 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 %}
--- 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>
--- 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 %}

--- 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">
--- 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 %}

--- 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 %}

--- 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 %}

--- 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 %}

--- 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 %}

--- 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 %}
--- 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>
--- 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 %}