Adjust product update template

- Ensure variant overview shows attributes - Use form field partial where appropriate
django-oscar · Dec 11, 2013 · b62f8ae · b62f8ae
1 parent 4f709cd
commit b62f8ae
Showing 1 changed file with 6 additions and 25 deletions.
diff --git a/oscar/templates/oscar/dashboard/catalogue/product_update.html b/oscar/templates/oscar/dashboard/catalogue/product_update.html
@@ -163,26 +163,7 @@ <h3>{% trans "Product Details" %}</h3>
                                             {{ field }}
                                         {% endif %}
                                         {% if 'attr' not in field.id_for_label %}
-                                            <div class="control-group {% for error in field.errors %}error{% endfor %}">
-                                                {% if field.is_hidden %}
-                                                    {{ field }}
-                                                {% else %}
-                                                    <label for="{{ field.auto_id }}" class="control-label {% if field.field.required %}required{% endif %}">{{ field.label }}{% if field.field.required %} <span>*</span>{% endif %}</label>
-                                                    <div class="controls">
-                                                        {{ field }}
-                                                        {% for error in field.errors %}
-                                                            <span class="help-block">
-                                                                {{ error }}
-                                                            </span>
-                                                        {% endfor %}
-                                                        {% if field.help_text %}
-                                                            <span class='help-block'>
-                                                                {{ field.help_text }}
-                                                            </span>
-                                                        {% endif %}
-                                                    </div>
-                                                {% endif %}
-                                            </div>
+                                            {% include "partials/form_field.html" with field=field %}
                                         {% endif %}
                                     {% endfor %}
 
@@ -211,23 +192,23 @@ <h3>{% trans "Product Details" %}</h3>
                                             {% with parent=product.parent %}
                                                 {% if parent %}
                                                     <tr>
-                                                        <th>{% trans "Parent" %}</th>
-                                                        <th></th>
+                                                        <th colspan="3">{% trans "Parent" %}</th>
                                                     </tr>
                                                     <tr>
                                                         <td>{{ parent.title }}</td>
+                                                        <td></td>
                                                         <td><a href="{% url 'dashboard:catalogue-product' pk=parent.id %}" class="btn btn-primary" title="{% blocktrans %}Edit {{ parent.title }}{% endblocktrans %}">{% trans "Edit" %}</a></td>
                                                     </tr>
                                                 {% endif %}
                                             {% endwith %}
                                             <tr>
-                                                <th>{% trans "Children" %}</th>
-                                                <th></th>
+                                                <th colspan="3">{% trans "Children" %}</th>
                                             </tr>
 
                                             {% for variant in variants %}
                                                 <tr>
-                                                    <td>{{ variant.title }}</td>
+                                                    <td>{{ variant.get_title }}</td>
+                                                    <td>{{ variant.attribute_summary }}</td>
                                                     <td><a href="{% url 'dashboard:catalogue-product' pk=variant.id %}" class="btn btn-primary">{% trans "Edit" %}</a></td>
                                                 </tr>
                                             {% endfor %}