Merge pull request #3459 from solarissmoke/fix/remove-redundant-form

Remove redundant bulk_edit_form.html from dashboard order list view.

src/oscar/templates/oscar/dashboard/orders/order_list.html

@@ -91,7 +91,6 @@
     {% if orders %}
         <form method="post" class="order_table" id="orders_form">
             {% csrf_token %}
-            {% include "oscar/dashboard/orders/partials/bulk_edit_form.html" with status=active_status %}
 
             {% block order_list %}
             <table class="table table-striped table-bordered table-hover">
@@ -175,7 +174,6 @@
                 </div>
             {% endblock %}
 
-            {% include "oscar/dashboard/orders/partials/bulk_edit_form.html" with status=active_status %}
             {% include "oscar/dashboard/partials/pagination.html" %}
         </form>
     {% else %}

src/oscar/templates/oscar/dashboard/orders/partials/bulk_edit_form.html

@@ -1,33 +0,0 @@
-{% load i18n %}
-
-{% if status %}
-    <div class="well well-danger">
-        {% if status == "new" or status == "processing" %}
-            <button class="btn btn-primary" type="submit" name="action" value="generate_packing_slips" data-loading-text="{% trans 'Submitting...' %}">{% trans "Print Packaging Slips" %}</button>
-        {% endif %}
-
-        {% for slug, name in available_status_list %}
-            <a data-toggle="modal" href="#{{ slug }}_modal" class="btn btn-primary">{% trans "Mark as" %} {{ name }}</a>
-
-            <div class="modal hide fade" id="{{ slug }}_modal">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal">×</button>
-                    <h3>{% trans "Change order status to" %} {{ name }}</h3>
-                </div>
-
-                <div class="modal-body">
-                    <span class="form-group">
-                        <label for="new_status">{% trans "Change order status to" %} {{ name }}</label>
-                        <input type="checkbox" name="new_status" id="new_status" value="{{ slug }}"/>
-                    </span>
-                </div>
-
-                <div class="modal-footer">
-                    <a href="#" class="btn btn-default" data-dismiss="modal">{% trans "Cancel" %}</a>
-                    <button type="submit" class="btn btn-primary" name="action" value="change_status_selected_orders" data-loading-text="{% trans 'Submitting...' %}">{% trans "Done" %}</button>
-                </div>
-
-            </div>
-        {% endfor %}
-    </div>
-{% endif %}