Remove 'load url from future'

Use staticfiles template tag instead of the obsolete
'load url from future'. Also fix unit tests.

Change-Id: Ifc36d5ca69db298bb74e2519731cd1a138bdc391
Story: 2001059
Task: 4663
This commit is contained in:
Artur Basiak 2017-06-06 08:46:01 +02:00
parent 777f69305d
commit 4e5a3b8218
14 changed files with 3 additions and 15 deletions

View File

@ -1,6 +1,5 @@
{% extends "horizon/common/_modal_form.html" %}
{% load i18n %}
{% load url from future %}
{% block form_id %}edit_alarm_form{% endblock %}
{% block form_action %}{{ action_url }}{% endblock %}

View File

@ -1,7 +1,6 @@
{% extends 'base.html' %}
{% load i18n %}
{% load url from future %}
{% load compress %}
{% block title %}{% trans 'Alarm Definitions' %}{% endblock %}

View File

@ -1,5 +1,4 @@
{% load i18n %}
{% load url from future %}
<div ng-controller="alarmNotificationFieldController as ctrl" ng-init="ctrl.init('{{ data }}')">
<div ng-if="ctrl.empty">

View File

@ -1,6 +1,5 @@
{% extends "horizon/common/_modal_form.html" %}
{% load i18n %}
{% load url from future %}
{% block modal-body %}

View File

@ -1,6 +1,5 @@
{% extends 'base.html' %}
{% load i18n %}
{% load url from future %}
{% block title %}{% trans 'Alarms' %}{% endblock %}

View File

@ -1,6 +1,5 @@
{% extends 'base.html' %}
{% load i18n %}
{% load url from future %}
{% block title %}{% trans 'Alarm History' %}{% endblock %}

View File

@ -1,6 +1,5 @@
{% extends 'base.html' %}
{% load i18n %}
{% load url from future %}
{% block title %}{% trans 'Measurements for Alarms' %}{% endblock %}

View File

@ -1,6 +1,5 @@
{% extends "horizon/common/_modal_form.html" %}
{% load i18n %}
{% load url from future %}
{% block form_id %}create_notif_method_form{% endblock %}
{% block form_action %}{{ action_url }}{% endblock %}

View File

@ -1,6 +1,5 @@
{% extends "horizon/common/_modal_form.html" %}
{% load i18n %}
{% load url from future %}
{% block form_id %}detail_notif_method_form{% endblock %}
{% block form_action %}{% url 'horizon:project:monitoring_notifications:methods:detail' notification_method.id %}{% endblock %}

View File

@ -1,6 +1,5 @@
{% extends "horizon/common/_modal_form.html" %}
{% load i18n %}
{% load url from future %}
{% block form_id %}edit_method_form{% endblock %}
{% block form_action %}{{ action_url }}{% endblock %}

View File

@ -5,7 +5,6 @@
{% block page_header %}
{% include 'horizon/common/_page_header.html' with title=_("Notifications") %}
{% endblock page_header %}
{% load url from future %}
{% block main %}
{{ table.render }}
<div class="pagination">

View File

@ -5,7 +5,6 @@
{% block page_header %}
{% include 'horizon/common/_page_header.html' with title=_("Monitoring") %}
{% endblock page_header %}
{% load url from future %}
{% block main %}
<div style="padding: 3px;">
{% if grafana_url %}

View File

@ -12,10 +12,10 @@
# under the License.
import os
import unittest
import warnings
from django.core.handlers import wsgi
from django.utils import unittest
from monitoring.test.test_data import utils as test_data_utils
from openstack_dashboard.test import helpers as openstack_dashboard_helpers

View File

@ -26,9 +26,9 @@ TEMPLATE_DIRS = (
os.path.join(TEST_DIR, 'templates'),
)
TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + [
'openstack_dashboard.context_processors.openstack',
)
]
INSTALLED_APPS = (
'django.contrib.contenttypes',