Fix 'RemovedInDjango19Warning' related to murano-dashboard
This prevents failure after upgrading to Django 1.9 and reduces spam in logs. Change-Id: I2d472413b7073a01affebbc99482726672f37b60 Closes-Bug: #1499661
This commit is contained in:
parent
9f25a517da
commit
9d6ce50864
|
@ -12,10 +12,10 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from collections import OrderedDict
|
||||
import json
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.utils.datastructures import SortedDict
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from horizon import exceptions
|
||||
from horizon import tabs
|
||||
|
@ -75,7 +75,7 @@ class OverviewTab(tabs.Tab):
|
|||
if id == service_data['?']['status']:
|
||||
status_name = name
|
||||
|
||||
detail_info = SortedDict([
|
||||
detail_info = OrderedDict([
|
||||
('Name', getattr(service_data, 'name', '')),
|
||||
('ID', service_data['?']['id']),
|
||||
('Type', service_data['?'][consts.DASHBOARD_ATTRS_KEY]['name']),
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
|
||||
<div class="status row detail app_license">
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
|
||||
<div class="status row detail app_requirements">
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
{% block page_header %}
|
||||
<div class='page-header'>
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
|
||||
<div class="status row detail app_overview">
|
||||
<div class="app-meta">
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
{% if environment %}
|
||||
<a href="{% url 'horizon:murano:catalog:deploy' app.id environment.id %}" class="{{ class }}"><i class="fa fa-plus-circle"></i> {% trans "Add to Env" %}</a>
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
{% load i18n sizeformat %}
|
||||
{% load static %}
|
||||
{% load compress %}
|
||||
{% load url from future %}
|
||||
{% block title %}{% trans "Application Details" %}: {{ app.name }}{% endblock %}
|
||||
|
||||
{% block css %}
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
{% load i18n %}
|
||||
{% load static %}
|
||||
{% load url from future %}
|
||||
|
||||
|
||||
<div class="col-xs-12 col-sm-6 col-md-6 col-lg-4 col">
|
||||
<div class="well app">
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{% load custom_filters %}
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
<h3>{% trans "Categories" %}</h3>
|
||||
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
<h3 class="heading_switcher env_switcher">{% trans "Environment:" %}
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
{% load i18n %}
|
||||
{% load static %}
|
||||
{% load compress %}
|
||||
{% load url from future %}
|
||||
|
||||
{% block title %}{% trans "Applications" %}{% endblock %}
|
||||
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
{% trans "Quick Deploy" as label %}
|
||||
<a href="{% url 'horizon:murano:catalog:quick_deploy' app.id %}" class="{{ class }}"><i class="fa fa-rocket"></i> {{ label }}</a>
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{% extends 'horizon/common/_modal_form.html' %}
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
{% block modal-body-right %}
|
||||
<h3>{% trans 'Description:' %}</h3>
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
{% block page_header %}
|
||||
<div class='page-header'>
|
||||
<h2>
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{% extends 'horizon/common/_modal_form.html' %}
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
{% block modal-body-right %}
|
||||
<h3>{% trans 'Description:' %}</h3>
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{% extends 'horizon/common/_modal_form.html' %}
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
{% block modal-body-right %}
|
||||
<h3>{% trans 'Description:' %}</h3>
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{% extends "horizon/common/_modal_form.html" %}
|
||||
{% load i18n %}
|
||||
{% load static %}
|
||||
{% load url from future %}
|
||||
|
||||
{% block form_id %}import_bundle{% endblock %}
|
||||
{% block form_action %}{% url 'horizon:murano:packages:import_bundle' %}{% endblock %}
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{% extends 'horizon/common/_modal_form.html' %}
|
||||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
{% block form_id %}{% endblock %}
|
||||
{% block form_action %}{% url 'horizon:murano:packages:modify' app_id %}{% endblock %}
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
{% extends "horizon/common/_modal_form.html" %}
|
||||
{% load i18n %}
|
||||
{% load static %}
|
||||
{% load url from future %}
|
||||
|
||||
{% block form_id %}upload_package{% endblock %}
|
||||
{% block form_action %}{% url 'horizon:murano:packages:upload' %}{% endblock %}
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
{% block page_header %}
|
||||
<div class='page-header'>
|
||||
<h2>
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
<h3>{% trans "Component Details" %}</h3>
|
||||
<div class="status_detail">
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
{% load static %}
|
||||
{% block page_header %}
|
||||
<div class='page-header'>
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
{% extends "horizon/common/_modal_form.html" %}
|
||||
{% load i18n humanize %}
|
||||
{% load url from future %}
|
||||
{% block form_action %}
|
||||
{% url 'horizon:murano:catalog:add' app_id environment_id do_redirect drop_wm_form %}
|
||||
{% endblock %}
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
<div class="col-xs-2 draggable_app">
|
||||
<div class="well well-sm" draggable="true">
|
||||
|
|
Loading…
Reference in New Issue