Refactor variants page

InvenTree/part/templates/part/detail.html

@@ -107,6 +107,31 @@
     </div>
 </div>
 
+<div class='panel panel-default panel-inventree panel-hidden' id='panel-variants'>
+    <div class='panel-heading'>
+        <h4>{% trans "Part Variants" %}</h4>
+    </div>
+    <div class='panel-content'>
+        <div id='variant-button-toolbar'>
+            <div class='button-toolbar container-fluid'>
+                <div class='btn-group' role='group'>
+                    {% if part.is_template and part.active %}
+                    <button class='btn btn-success' id='new-variant' title='{% trans "Create new variant" %}'>
+                        <span class='fas fa-plus-circle'></span> {% trans "New Variant" %}
+                    </button>
+                    {% endif %}
+                </div>
+                <div class='filter-list' id='filter-list-variants'>
+                    <!-- Empty div (will be filled out with available BOM filters) -->
+                </div>
+            </div>
+        </div>
+        
+        <table class='table table-striped table-condensed' id='variants-table' data-toolbar='#variant-button-toolbar'>
+        </table>
+    </div>
+</div>
+
 <div class='panel panel-default panel-inventree panel-hidden' id='panel-part-parameters'>
     <div class='panel-heading'>
         <h4>{% trans "Parameters" %}</h4>
@@ -191,6 +216,17 @@
 {% block js_ready %}
     {{ block.super }}
 
+    loadPartVariantTable($('#variants-table'), {{ part.pk }});
+
+    $('#new-variant').click(function() {
+        launchModalForm(
+            "{% url 'make-part-variant' part.id %}",
+            {
+                follow: true,
+            }
+        );
+    });
+
     loadPurchaseOrderTable($("#purchase-order-table"), {
         url: "{% url 'api-po-list' %}",
         params: {

InvenTree/part/templates/part/navbar.html

@@ -19,7 +19,7 @@
     </li>
     {% if part.is_template %}
     <li class='list-group-item' title='{% trans "Part Variants" %}'>
-        <a href='#' id='select-part-variants' class='nav-toggle'>
+        <a href='#' id='select-variants' class='nav-toggle'>
             <span class='menu-tab-icon fas fa-shapes sidebar-icon'></span>
             {% trans "Variants" %}
         </a>

InvenTree/part/templates/part/part_base.html

@@ -167,7 +167,7 @@
             {% endif %}
             {% if part.variant_of %}
             <div class='alert alert-info alert-block'>
-                {% object_link 'part-variants' part.variant_of.id part.variant_of.full_name as link %}
+                {% object_link 'part-detail' part.variant_of.id part.variant_of.full_name as link %}
                 {% blocktrans %}This part is a variant of {{link}}{% endblocktrans %}
             </div>
             {% endif %}

InvenTree/part/templates/part/variants.html

@@ -1,49 +0,0 @@
-{% extends "part/part_base.html" %}
-{% load static %}
-{% load i18n %}
-{% load inventree_extras %}
-
-{% block menubar %}
-{% include "part/navbar.html" with tab='variants' %}
-{% endblock %}
-
-{% block heading %}
-{% trans "Part Variants" %}
-{% endblock %}
-
-{% block details %}
-<div id='button-toolbar'>
-    <div class='button-toolbar container-fluid'>
-        <div class='btn-group' role='group'>
-            {% if part.is_template and part.active %}
-            <button class='btn btn-success' id='new-variant' title='{% trans "Create new variant" %}'>
-                <span class='fas fa-plus-circle'></span> {% trans "New Variant" %}
-            </button>
-            {% endif %}
-        </div>
-        <div class='filter-list' id='filter-list-variants'>
-            <!-- Empty div (will be filled out with available BOM filters) -->
-        </div>
-    </div>
-</div>
-
-<table class='table table-striped table-condensed' id='variants-table' data-toolbar='#button-toolbar'>
-</table>
-
-{% endblock %}
-
-{% block js_ready %}
-{{ block.super }}
-
-    loadPartVariantTable($('#variants-table'), {{ part.pk }});
-
-    $('#new-variant').click(function() {
-        launchModalForm(
-            "{% url 'make-part-variant' part.id %}",
-            {
-                follow: true,
-            }
-        );
-    });
-
-{% endblock %}

InvenTree/part/urls.py

@@ -47,7 +47,6 @@ part_detail_urls = [
     url(r'^bom-upload/?', views.BomUpload.as_view(), name='upload-bom'),
     url(r'^bom-duplicate/?', views.BomDuplicate.as_view(), name='duplicate-bom'),
 
-    url(r'^variants/?', views.PartDetail.as_view(template_name='part/variants.html'), name='part-variants'),
     url(r'^allocation/?', views.PartDetail.as_view(template_name='part/allocation.html'), name='part-allocation'),
     url(r'^bom/?', views.PartDetail.as_view(template_name='part/bom.html'), name='part-bom'),
     url(r'^build/?', views.PartDetail.as_view(template_name='part/build.html'), name='part-build'),