From 6f4ee9e016a6b3383bda6b846980eabdd36df519 Mon Sep 17 00:00:00 2001 From: shtalinberg Date: Fri, 3 Jul 2015 13:25:15 +0300 Subject: [PATCH] #3 - fix import and cleanup RemovedInDjango19Warning: Loading the `url` tag from the `future` library is deprecated --- admin_tools/dashboard/modules.py | 2 +- .../dashboard/templates/admin_tools/dashboard/dashboard.html | 3 +-- .../menu/templates/admin_tools/menu/add_bookmark_form.html | 1 - .../menu/templates/admin_tools/menu/remove_bookmark_form.html | 1 - admin_tools/theming/templates/admin/base.html | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/admin_tools/dashboard/modules.py b/admin_tools/dashboard/modules.py index d740376..eaad20b 100644 --- a/admin_tools/dashboard/modules.py +++ b/admin_tools/dashboard/modules.py @@ -5,7 +5,7 @@ Module where admin tools dashboard modules classes are defined. from django.utils.text import capfirst from django.core.urlresolvers import reverse from django.contrib.contenttypes.models import ContentType -from django.forms.util import flatatt +from django.forms.utils import flatatt from django.utils.translation import ugettext_lazy as _ from django.utils.itercompat import is_iterable diff --git a/admin_tools/dashboard/templates/admin_tools/dashboard/dashboard.html b/admin_tools/dashboard/templates/admin_tools/dashboard/dashboard.html index b1c5727..88831ae 100644 --- a/admin_tools/dashboard/templates/admin_tools/dashboard/dashboard.html +++ b/admin_tools/dashboard/templates/admin_tools/dashboard/dashboard.html @@ -1,5 +1,4 @@ {% load i18n admin_tools_dashboard_tags %} -{% load url from future %} {% block dashboard_scripts %} @@ -79,4 +78,4 @@ {% for module in dashboard.children %} {% admin_tools_render_dashboard_module module %}{% endfor %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/admin_tools/menu/templates/admin_tools/menu/add_bookmark_form.html b/admin_tools/menu/templates/admin_tools/menu/add_bookmark_form.html index 93972ef..8b84606 100644 --- a/admin_tools/menu/templates/admin_tools/menu/add_bookmark_form.html +++ b/admin_tools/menu/templates/admin_tools/menu/add_bookmark_form.html @@ -1,4 +1,3 @@ -{% load url from future %} {% url 'admin-tools-menu-add-bookmark' as form_url %} {% if form_url %}
diff --git a/admin_tools/menu/templates/admin_tools/menu/remove_bookmark_form.html b/admin_tools/menu/templates/admin_tools/menu/remove_bookmark_form.html index b0cad55..671f4b2 100644 --- a/admin_tools/menu/templates/admin_tools/menu/remove_bookmark_form.html +++ b/admin_tools/menu/templates/admin_tools/menu/remove_bookmark_form.html @@ -1,4 +1,3 @@ -{% load url from future %} {% url 'admin-tools-menu-remove-bookmark' bookmark.id as form_url%} {% if form_url %} diff --git a/admin_tools/theming/templates/admin/base.html b/admin_tools/theming/templates/admin/base.html index c6ea5fe..1d38d7e 100644 --- a/admin_tools/theming/templates/admin/base.html +++ b/admin_tools/theming/templates/admin/base.html @@ -1,4 +1,3 @@ -{% load url from future %} {% load theming_tags %}