aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2014-11-20 12:38:08 +0000
committerTom Christie2014-11-20 12:38:08 +0000
commit9c6bead8b6d3f9ae11e9859ed305e8d0f7a9e0d8 (patch)
tree0760c0acfc0d29b8b4e6adda14e1311177fc5221
parent6794b3380a32b53fa88547a8b2a2b34834fe4df7 (diff)
downloaddjango-rest-framework-9c6bead8b6d3f9ae11e9859ed305e8d0f7a9e0d8.tar.bz2
Add --- null option for selects. Closes #2096.
-rw-r--r--rest_framework/templates/rest_framework/horizontal/select.html3
-rw-r--r--rest_framework/templates/rest_framework/inline/select.html5
-rw-r--r--rest_framework/templates/rest_framework/vertical/select.html5
3 files changed, 11 insertions, 2 deletions
diff --git a/rest_framework/templates/rest_framework/horizontal/select.html b/rest_framework/templates/rest_framework/horizontal/select.html
index 1d00f424..380b38e9 100644
--- a/rest_framework/templates/rest_framework/horizontal/select.html
+++ b/rest_framework/templates/rest_framework/horizontal/select.html
@@ -4,6 +4,9 @@
{% endif %}
<div class="col-sm-10">
<select class="form-control" name="{{ field.name }}">
+ {% if field.allow_null %}
+ <option value="" {% if not field.value %}selected{% endif %}>--------</option>
+ {% endif %}
{% for key, text in field.choices.items %}
<option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
{% endfor %}
diff --git a/rest_framework/templates/rest_framework/inline/select.html b/rest_framework/templates/rest_framework/inline/select.html
index e9fcebb4..53af2772 100644
--- a/rest_framework/templates/rest_framework/inline/select.html
+++ b/rest_framework/templates/rest_framework/inline/select.html
@@ -3,8 +3,11 @@
<label class="sr-only">{{ field.label }}</label>
{% endif %}
<select class="form-control" name="{{ field.name }}">
+ {% if field.allow_null %}
+ <option value="" {% if not field.value %}selected{% endif %}>--------</option>
+ {% endif %}
{% for key, text in field.choices.items %}
- <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
+ <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
{% endfor %}
</select>
</div>
diff --git a/rest_framework/templates/rest_framework/vertical/select.html b/rest_framework/templates/rest_framework/vertical/select.html
index 7c673ebb..de72e1dd 100644
--- a/rest_framework/templates/rest_framework/vertical/select.html
+++ b/rest_framework/templates/rest_framework/vertical/select.html
@@ -3,8 +3,11 @@
<label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>
{% endif %}
<select class="form-control" name="{{ field.name }}">
+ {% if field.allow_null %}
+ <option value="" {% if not field.value %}selected{% endif %}>--------</option>
+ {% endif %}
{% for key, text in field.choices.items %}
- <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
+ <option value="{{ key }}" {% if key == field.value %}selected{% endif %}>{{ text }}</option>
{% endfor %}
</select>
{% if field.errors %}