diff options
| author | José Padilla | 2014-12-09 09:25:06 -0400 | 
|---|---|---|
| committer | José Padilla | 2014-12-09 09:25:06 -0400 | 
| commit | afe7ed9333e37384f8ddc57e891da9632c8714c3 (patch) | |
| tree | c45f1a1242b9c12f4e1e3aaaab2ff6eb90473ed9 /rest_framework/templates | |
| parent | 0f080bc2932095bc6dd2c71f545f2b588985431d (diff) | |
| download | django-rest-framework-afe7ed9333e37384f8ddc57e891da9632c8714c3.tar.bz2 | |
Add allow_blank for ChoiceField #2184
This makes a ChoiceField optional in HTML if
model field has `blank=True` set.
Diffstat (limited to 'rest_framework/templates')
3 files changed, 3 insertions, 3 deletions
| diff --git a/rest_framework/templates/rest_framework/horizontal/select.html b/rest_framework/templates/rest_framework/horizontal/select.html index 380b38e9..8a7fca37 100644 --- a/rest_framework/templates/rest_framework/horizontal/select.html +++ b/rest_framework/templates/rest_framework/horizontal/select.html @@ -4,7 +4,7 @@      {% endif %}      <div class="col-sm-10">          <select class="form-control" name="{{ field.name }}"> -        {% if field.allow_null %} +        {% if field.allow_null or field.allow_blank %}              <option value="" {% if not field.value %}selected{% endif %}>--------</option>          {% endif %}          {% for key, text in field.choices.items %} diff --git a/rest_framework/templates/rest_framework/inline/select.html b/rest_framework/templates/rest_framework/inline/select.html index 53af2772..6b30e4d6 100644 --- a/rest_framework/templates/rest_framework/inline/select.html +++ b/rest_framework/templates/rest_framework/inline/select.html @@ -3,7 +3,7 @@          <label class="sr-only">{{ field.label }}</label>      {% endif %}      <select class="form-control" name="{{ field.name }}"> -        {% if field.allow_null %} +        {% if field.allow_null or field.allow_blank %}              <option value="" {% if not field.value %}selected{% endif %}>--------</option>          {% endif %}          {% for key, text in field.choices.items %} diff --git a/rest_framework/templates/rest_framework/vertical/select.html b/rest_framework/templates/rest_framework/vertical/select.html index de72e1dd..1d1109f6 100644 --- a/rest_framework/templates/rest_framework/vertical/select.html +++ b/rest_framework/templates/rest_framework/vertical/select.html @@ -3,7 +3,7 @@          <label {% if style.hide_label %}class="sr-only"{% endif %}>{{ field.label }}</label>      {% endif %}      <select class="form-control" name="{{ field.name }}"> -        {% if field.allow_null %} +        {% if field.allow_null or field.allow_blank %}              <option value="" {% if not field.value %}selected{% endif %}>--------</option>          {% endif %}          {% for key, text in field.choices.items %} | 
