ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Revert "Add a few Jinja2 tests to simplify template (#37514)"

Browse source 
This reverts commit b8e07f0d6e.
This commit is contained in:
Brian Coca 2018-03-20 18:20:30 -04:00
parent b8e07f0d6e
commit 06b70f1614
2 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
docs/bin/plugin_formatter.py
View file

@ -29,7 +29,7 @@ import os
import re
import sys
import warnings
from collections import defaultdict, Sequence
from collections import defaultdict
from distutils.version import LooseVersion
from pprint import PrettyPrinter
@ -132,12 +132,6 @@ def rst_xline(width, char="="):
return char * width
# NOTE: The existing Jinja2 'sequence' tests matches strings and dictionaries
def test_list(value):
''' Return true if objects is a list or tupple '''
return isinstance(value, Sequence)
def write_data(text, output_dir, outputname, module=None):
''' dumps module output to a file or the screen, as requested '''
@ -310,9 +304,6 @@ def jinja2_environment(template_dir, typ, plugin_type):
env.filters['html_ify'] = html_ify
env.filters['fmt'] = rst_fmt
env.filters['xline'] = rst_xline
env.tests['list'] = test_list
templates['plugin'] = env.get_template('plugin.rst.j2')
if plugin_type == 'module':

16
docs/templates/plugin.rst.j2 vendored
View file

@ -108,10 +108,12 @@ Parameters
<td>
<div class="cell-border">
{# Turn boolean values in 'yes' and 'no' values #}
{% if value.default is sameas true %}
{% set _x = value.update({'default': 'yes'}) %}
{% elif value.default is sameas false %}
{% set _x = value.update({'default': 'no'}) %}
{% if value.default is defined %}
{% if value.default == true %}
{% set _x = value.update({'default': 'yes'}) %}
{% elif value.default == false %}
{% set _x = value.update({'default': 'no'}) %}
{% endif %}
{% endif %}
{% if value.type == 'bool' %}
{% set _x = value.update({'choices': ['no', 'yes']}) %}
@ -121,12 +123,12 @@ Parameters
<ul><b>Choices:</b>
{% for choice in value.choices %}
{# Turn boolean values in 'yes' and 'no' values #}
{% if choice is sameas true %}
{% if choice == true %}
{% set choice = 'yes' %}
{% elif choice is sameas false %}
{% elif choice == false %}
{% set choice = 'no' %}
{% endif %}
{% if (value.default is string and value.default == choice) or (value.default is list and choice in value.default) %}
{% if (value.default is string and value.default == choice) or (value.default is iterable and value.default is not string and choice in value.default) %}
<li><div style="color: blue"><b>@{ choice | escape }@</b>&nbsp;&larr;</div></li>
{% else %}
<li>@{ choice | escape }@</li>