Skip to content

Do not HTML-escape help_text in Browsable API forms. #3812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lovelydinosaur merged 1 commit into from
Jun 2, 2016
Merged

Do not HTML-escape help_text in Browsable API forms. #3812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Change serializer field help_text rendering in browsable api
  • Loading branch information
Sergei Sinitsyn committed Jan 8, 2016
commit 9fe8df7387d2379431d22d6c56613970b5d6f5d2
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/horizontal/checkbox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>
</div>
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/horizontal/checkbox_multiple.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>
</div>
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/horizontal/input.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>
</div>
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/horizontal/radio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>
</div>
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/horizontal/select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>
</div>
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/horizontal/select_multiple.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>
</div>
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/horizontal/textarea.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>
</div>
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/raw_data_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{{ field.label_tag|add_class:"col-sm-2 control-label" }}
<div class="col-sm-10">
{{ field|add_class:"form-control" }}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
</div>
</div>
{% endfor %}
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/vertical/checkbox.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/vertical/checkbox_multiple.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/vertical/input.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/vertical/radio.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/vertical/select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/vertical/select_multiple.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>
2 changes: 1 addition & 1 deletion rest_framework/templates/rest_framework/vertical/textarea.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
{% endif %}

{% if field.help_text %}
<span class="help-block">{{ field.help_text }}</span>
<span class="help-block">{{ field.help_text|safe }}</span>
{% endif %}
</div>