From e0af3fd7e6d9daf9ae0231e22d745eba2817d2ae Mon Sep 17 00:00:00 2001 From: Rob Cresswell Date: Mon, 14 Sep 2015 14:24:47 +0100 Subject: [PATCH] Drop Django 1.7 support Django 1.7 support ends in December 2015 (https://www.djangoproject.com/download/#supported-versions), so it will not be supported by Mitaka release. This patch removes many of the deprecation warnings:- `RedirectView.permanent` change: https://docs.djangoproject.com/en/1.8/ref/class-based-views/base/ `url` change: https://docs.djangoproject.com/en/1.8/internals/deprecation/ See version 1.5 notes for the url and ssi template tag change `django.forms.utils` change: https://docs.djangoproject.com/en/1.8/internals/deprecation/ See version 1.9 notes `firstof` change: https://docs.djangoproject.com/en/1.8/internals/deprecation/ See version 1.8 notes for cycle and firstof template tags Change-Id: If546c087e73d189daa92e5bd63f0533fcf19089f Partially-Implements: blueprint drop-dj17 --- .../content/databases/templates/databases/_detail_overview.html | 1 - .../content/databases/templates/databases/_resize_instance.html | 1 - .../content/databases/templates/databases/_resize_volume.html | 1 - 3 files changed, 3 deletions(-) diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html index a873c1b..212f520 100644 --- a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html +++ b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html @@ -1,5 +1,4 @@ {% load i18n sizeformat %} -{% load url from future %}
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_instance.html b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_instance.html index 8de3c33..48d64d8 100644 --- a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_instance.html +++ b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_instance.html @@ -1,6 +1,5 @@ {% extends "horizon/common/_modal_form.html" %} {% load i18n %} -{% load url from future %} {% block form_id %}resize_instance_form{% endblock %} {% block form_action %}{% url "horizon:project:databases:resize_instance" instance_id %}{% endblock %} diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_volume.html b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_volume.html index b9a3661..fcc212f 100644 --- a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_volume.html +++ b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_volume.html @@ -1,6 +1,5 @@ {% extends "horizon/common/_modal_form.html" %} {% load i18n %} -{% load url from future %} {% block form_id %}resize_volume_form{% endblock %} {% block form_action %}{% url "horizon:project:databases:resize_volume" instance_id %}{% endblock %}