openstack
/
congress-dashboard
Code Issues Proposed changes

Merge "Make compatible with Django 1.10 and 1.11"

This commit is contained in:
Zuul 2019-03-19 17:56:05 +00:00 committed by Gerrit Code Review
parent 97cc90da48 f78c7dd683
commit b8b6d93cee
4 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
congress_dashboard/datasources/templates/datasources/_create.html
View File

@ -1,6 +1,5 @@
{% extends "horizon/common/_modal_form.html" %}
{% load i18n %}
{% load url from future %}
{% block form_id %}create_datasource_form{% endblock %}
{% block form_action %}{% url 'horizon:admin:datasources:create' %}{% endblock %}

4
congress_dashboard/policies/rules/workflows.py
View File

@ -79,7 +79,7 @@ class CreateOutput(workflows.Step):
columns_list = policy_columns.split(', ')
context['policy_columns_list'] = columns_list
context['policy_columns_count'] = len(columns_list)
return step_template.render(context)
return step_template.render(context.flatten())
class CreateConditionsAction(workflows.Action):
@ -170,7 +170,7 @@ class CreateConditions(workflows.Step):
context['column_pattern_error'] = COLUMN_PATTERN_ERROR
context['table_pattern'] = TABLE_PATTERN
context['table_pattern_error'] = TABLE_PATTERN_ERROR
return step_template.render(context)
return step_template.render(context.flatten())
def _underscore_slugify(name):

1
congress_dashboard/policies/templates/policies/_create.html
View File

@ -1,6 +1,5 @@
{% extends "horizon/common/_modal_form.html" %}
{% load i18n %}
{% load url from future %}
{% block form_id %}create_policy_form{% endblock %}
{% block form_action %}{% url 'horizon:admin:policies:create' %}{% endblock %}

1
congress_dashboard/policies/templates/policies/rules/_create_raw.html
View File

@ -1,6 +1,5 @@
{% extends "horizon/common/_modal_form.html" %}
{% load i18n %}
{% load url from future %}
{% block form_id %}create_raw_rule_form{% endblock %}
{% block form_action %}{% url 'horizon:admin:policies:create_raw_rule' policy_name %}{% endblock %}