From a0e852a4d52558db93209b4616f030b4ae2dcedb Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 9 Oct 2014 16:30:06 +0100
Subject: Use BoundField .name on fields

---
 rest_framework/templates/rest_framework/fields/attrs.html             | 2 +-
 .../templates/rest_framework/fields/horizontal/checkbox.html          | 2 +-
 rest_framework/templates/rest_framework/fields/horizontal/select.html | 2 +-
 .../templates/rest_framework/fields/horizontal/select_checkbox.html   | 4 ++--
 .../templates/rest_framework/fields/horizontal/select_multiple.html   | 2 +-
 .../templates/rest_framework/fields/horizontal/select_radio.html      | 4 ++--
 rest_framework/templates/rest_framework/fields/inline/checkbox.html   | 2 +-
 rest_framework/templates/rest_framework/fields/inline/select.html     | 2 +-
 .../templates/rest_framework/fields/inline/select_checkbox.html       | 2 +-
 .../templates/rest_framework/fields/inline/select_multiple.html       | 2 +-
 .../templates/rest_framework/fields/inline/select_radio.html          | 2 +-
 rest_framework/templates/rest_framework/fields/vertical/checkbox.html | 2 +-
 rest_framework/templates/rest_framework/fields/vertical/select.html   | 2 +-
 .../templates/rest_framework/fields/vertical/select_checkbox.html     | 4 ++--
 .../templates/rest_framework/fields/vertical/select_multiple.html     | 2 +-
 .../templates/rest_framework/fields/vertical/select_radio.html        | 4 ++--
 16 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'rest_framework')

diff --git a/rest_framework/templates/rest_framework/fields/attrs.html b/rest_framework/templates/rest_framework/fields/attrs.html
index b5a4dbcf..1e23c465 100644
--- a/rest_framework/templates/rest_framework/fields/attrs.html
+++ b/rest_framework/templates/rest_framework/fields/attrs.html
@@ -1 +1 @@
-name="{{ field.field_name }}" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %}
+name="{{ field.name }}" {% if field.style.placeholder %}placeholder="{{ field.style.placeholder }}"{% endif %} {% if field.style.rows %}rows="{{ field.style.rows }}"{% endif %}
diff --git a/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html b/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html
index dd3c3cef..ee3bf936 100644
--- a/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html
+++ b/rest_framework/templates/rest_framework/fields/horizontal/checkbox.html
@@ -2,7 +2,7 @@
     <div class="col-sm-offset-2 col-sm-10">
         <div class="checkbox">
             <label>
-                <input type="checkbox" name="{{ field.field_name }}" value="true" {% if field.value %}checked{% endif %}>
+                <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
                 {% if field.label %}{{ field.label }}{% endif %}
             </label>
         </div>
diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select.html b/rest_framework/templates/rest_framework/fields/horizontal/select.html
index 7367d726..10b4b139 100644
--- a/rest_framework/templates/rest_framework/fields/horizontal/select.html
+++ b/rest_framework/templates/rest_framework/fields/horizontal/select.html
@@ -1,7 +1,7 @@
 <div class="form-group">
     {% include "rest_framework/fields/horizontal/label.html" %}
     <div class="col-sm-10">
-        <select class="form-control" name="{{ field.field_name }}">
+        <select class="form-control" name="{{ field.name }}">
             {% 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/fields/horizontal/select_checkbox.html b/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html
index 381cda2c..6041fa74 100644
--- a/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html
+++ b/rest_framework/templates/rest_framework/fields/horizontal/select_checkbox.html
@@ -4,7 +4,7 @@
     {% if field.style.inline %}
         {% for key, text in field.choices.items %}
             <label class="checkbox-inline">
-                <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+                <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
                 {{ text }}
             </label>
         {% endfor %}
@@ -12,7 +12,7 @@
         {% for key, text in field.choices.items %}
             <div class="checkbox">
                 <label>
-                    <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+                    <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
                     {{ text }}
                 </label>
             </div>
diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html b/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html
index 29ba8661..c0dbb989 100644
--- a/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html
+++ b/rest_framework/templates/rest_framework/fields/horizontal/select_multiple.html
@@ -1,7 +1,7 @@
 <div class="form-group">
     {% include "rest_framework/fields/horizontal/label.html" %}
     <div class="col-sm-10">
-        <select multiple class="form-control" name="{{ field.field_name }}">
+        <select multiple class="form-control" name="{{ field.name }}">
             {% for key, text in field.choices.items %}
             <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
             {% endfor %}
diff --git a/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html b/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html
index 20aab8b2..0eeb9bc6 100644
--- a/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html
+++ b/rest_framework/templates/rest_framework/fields/horizontal/select_radio.html
@@ -4,7 +4,7 @@
     {% if field.style.inline %}
         {% for key, text in field.choices.items %}
             <label class="radio-inline">
-                <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
                 {{ text }}
             </label>
         {% endfor %}
@@ -12,7 +12,7 @@
         {% for key, text in field.choices.items %}
             <div class="radio">
                 <label>
-                    <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+                    <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
                     {{ text }}
                 </label>
             </div>
diff --git a/rest_framework/templates/rest_framework/fields/inline/checkbox.html b/rest_framework/templates/rest_framework/fields/inline/checkbox.html
index 289bbb4d..57fa5dc0 100644
--- a/rest_framework/templates/rest_framework/fields/inline/checkbox.html
+++ b/rest_framework/templates/rest_framework/fields/inline/checkbox.html
@@ -1,6 +1,6 @@
 <div class="checkbox">
     <label>
-        <input type="checkbox" name="{{ field.field_name }}" value="true" {% if field.value %}checked{% endif %}>
+        <input type="checkbox" name="{{ field.name }}" value="true" {% if field.value %}checked{% endif %}>
         {% if field.label %}{{ field.label }}{% endif %}
     </label>
 </div>
diff --git a/rest_framework/templates/rest_framework/fields/inline/select.html b/rest_framework/templates/rest_framework/fields/inline/select.html
index 9f361c4a..eebb91d2 100644
--- a/rest_framework/templates/rest_framework/fields/inline/select.html
+++ b/rest_framework/templates/rest_framework/fields/inline/select.html
@@ -1,6 +1,6 @@
 <div class="form-group">
     {% include "rest_framework/fields/inline/label.html" %}
-    <select class="form-control" name="{{ field.field_name }}">
+    <select class="form-control" name="{{ field.name }}">
         {% 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/fields/inline/select_checkbox.html b/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html
index 0f33fb69..b7561cd4 100644
--- a/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html
+++ b/rest_framework/templates/rest_framework/fields/inline/select_checkbox.html
@@ -3,7 +3,7 @@
     {% for key, text in field.choices.items %}
     <div class="checkbox">
         <label>
-            <input type="checkbox" name="{{ rest_framework/field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+            <input type="checkbox" name="{{ rest_framework/field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
             {{ text }}
         </label>
     </div>
diff --git a/rest_framework/templates/rest_framework/fields/inline/select_multiple.html b/rest_framework/templates/rest_framework/fields/inline/select_multiple.html
index 7c9e5168..74e17f9f 100644
--- a/rest_framework/templates/rest_framework/fields/inline/select_multiple.html
+++ b/rest_framework/templates/rest_framework/fields/inline/select_multiple.html
@@ -1,6 +1,6 @@
 <div class="form-group">
     {% include "rest_framework/fields/inline/label.html" %}
-    <select multiple class="form-control" name="{{ field.field_name }}">
+    <select multiple class="form-control" name="{{ field.name }}">
         {% for key, text in field.choices.items %}
         <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
         {% endfor %}
diff --git a/rest_framework/templates/rest_framework/fields/inline/select_radio.html b/rest_framework/templates/rest_framework/fields/inline/select_radio.html
index 177c0eeb..27927a62 100644
--- a/rest_framework/templates/rest_framework/fields/inline/select_radio.html
+++ b/rest_framework/templates/rest_framework/fields/inline/select_radio.html
@@ -3,7 +3,7 @@
     {% for key, text in field.choices.items %}
         <div class="radio">
             <label>
-                <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
                 {{ text }}
             </label>
         </div>
diff --git a/rest_framework/templates/rest_framework/fields/vertical/checkbox.html b/rest_framework/templates/rest_framework/fields/vertical/checkbox.html
index 01d30aae..9fd4cdaa 100644
--- a/rest_framework/templates/rest_framework/fields/vertical/checkbox.html
+++ b/rest_framework/templates/rest_framework/fields/vertical/checkbox.html
@@ -1,6 +1,6 @@
 <div class="checkbox">
     <label>
-        <input type="checkbox" name="{{ field.field_name }}" value="true" {% if value %}checked{% endif %}>
+        <input type="checkbox" name="{{ field.name }}" value="true" {% if value %}checked{% endif %}>
         {% if field.label %}{{ field.label }}{% endif %}
     </label>
 </div>
diff --git a/rest_framework/templates/rest_framework/fields/vertical/select.html b/rest_framework/templates/rest_framework/fields/vertical/select.html
index dcc9a3cd..1a651663 100644
--- a/rest_framework/templates/rest_framework/fields/vertical/select.html
+++ b/rest_framework/templates/rest_framework/fields/vertical/select.html
@@ -1,6 +1,6 @@
 <div class="form-group">
     {% include "rest_framework/fields/vertical/label.html" %}
-    <select class="form-control" name="{{ field.field_name }}">
+    <select class="form-control" name="{{ field.name }}">
         {% 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/fields/vertical/select_checkbox.html b/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html
index 1fbe6a94..2e792e6a 100644
--- a/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html
+++ b/rest_framework/templates/rest_framework/fields/vertical/select_checkbox.html
@@ -4,7 +4,7 @@
         <div>
         {% for key, text in field.choices.items %}
             <label class="checkbox-inline">
-                <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+                <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
                 {{ text }}
             </label>
         {% endfor %}
@@ -13,7 +13,7 @@
         {% for key, text in field.choices.items %}
         <div class="checkbox">
             <label>
-                <input type="checkbox" name="{{ field.field_name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
+                <input type="checkbox" name="{{ field.name }}" value="{{ key }}" {% if key in field.value %}checked{% endif %}>
                 {{ text }}
             </label>
         </div>
diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html b/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html
index 2cc40d99..5f4166cd 100644
--- a/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html
+++ b/rest_framework/templates/rest_framework/fields/vertical/select_multiple.html
@@ -1,6 +1,6 @@
 <div class="form-group">
     {% include "rest_framework/fields/vertical/label.html" %}
-    <select multiple class="form-control" name="{{ field.field_name }}">
+    <select multiple class="form-control" name="{{ field.name }}">
         {% for key, text in field.choices.items %}
         <option value="{{ key }}" {% if key in field.value %}selected{% endif %}>{{ text }}</option>
         {% endfor %}
diff --git a/rest_framework/templates/rest_framework/fields/vertical/select_radio.html b/rest_framework/templates/rest_framework/fields/vertical/select_radio.html
index 470bcb0b..2aa0fe28 100644
--- a/rest_framework/templates/rest_framework/fields/vertical/select_radio.html
+++ b/rest_framework/templates/rest_framework/fields/vertical/select_radio.html
@@ -4,7 +4,7 @@
         <div>
         {% for key, text in field.choices.items %}
             <label class="radio-inline">
-                <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+                <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
                 {{ text }}
             </label>
         {% endfor %}
@@ -13,7 +13,7 @@
         {% for key, text in field.choices.items %}
             <div class="radio">
                 <label>
-                    <input type="radio" name="{{ field.field_name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
+                    <input type="radio" name="{{ field.name }}" value="{{ key }}" {% if key == field.value %}checked{% endif %}>
                     {{ text }}
                 </label>
             </div>
-- 
cgit v1.2.3