Reorder tabs

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

vulnerabilities/migrations/0027_alter_all_models_to_add_ordering.py renamed to vulnerabilities/migrations/0024_alter_all_models_to_add_ordering.py

@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('vulnerabilities', '0026_alter_package_purl'),
+        ('vulnerabilities', '0023_vcid_migration'),
     ]
 
     operations = [
@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterModelOptions(
             name='package',
-            options={'ordering': ['purl']},
+            options={'ordering': ['type', 'namespace', 'name', 'version', 'qualifiers', 'subpath']},
         ),
         migrations.AlterModelOptions(
             name='packagerelatedvulnerability',

vulnerabilities/models.py

@@ -174,7 +174,7 @@ def purl(self):
 
     class Meta:
         unique_together = ["type", "namespace", "name", "version", "qualifiers", "subpath"]
-        ordering = ["purl"]
+        ordering = ["type", "namespace", "name", "version", "qualifiers", "subpath"]
 
     def __str__(self):
         return self.package_url

vulnerabilities/templates/vulnerability_details.html

@@ -28,36 +28,36 @@
 
             <div class="tabs is-boxed" id="tabs">
                 <ul>
-                    <li class="is-active" data-tab="1">
+                    <li class="is-active" data-tab="essentials">
                         <a>
                             <span>Essentials</span>
                         </a>
                     </li>
-                    <li data-tab="2">
+                    <li data-tab="fixed-by">
                         <a>
                             <span>
-                                References ({{ vulnerability.references.all|length }})
+                                Fixed by packages ({{ vulnerability.resolved_to|length }})
                             </span>
                         </a>
                     </li>
-                    <li data-tab="3">
+                    <li data-tab="affected-packages">
                         <a>
                             <span>
                                 Affected packages ({{ vulnerability.vulnerable_to|length }})
                             </span>
                         </a>
                     </li>
-                    <li data-tab="4">
+                    <li data-tab="references">
                         <a>
                             <span>
-                                Fixed by packages ({{ vulnerability.resolved_to|length }})
+                                References ({{ vulnerability.references.all|length }})
                             </span>
                         </a>
                     </li>
                 </ul>
             </div>
             <div id="tab-content">
-                <div class="tab-div is-active" data-content="1">
+                <div class="tab-div is-active" data-content="essentials">
                     <div class="tab-nested-div">
                         <table class="table vcio-table width-100-pct width-100-pct mt-2">
                             <tbody>
@@ -178,7 +178,7 @@
                     </div>
                 </div>
 
-                <div class="tab-div content" data-content="2">
+                <div class="tab-div content" data-content="references">
                     <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
                         <thead>
                             <tr>
@@ -205,7 +205,7 @@
                     </table>
                 </div>
 
-                <div class="tab-div content" data-content="3">
+                <div class="tab-div content" data-content="affected-packages">
                     <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
                         <thead>
                             <tr>
@@ -234,7 +234,7 @@
                     </table>
                 </div>
 
-                <div class="tab-div content" data-content="4">
+                <div class="tab-div content" data-content="fixed-by">
                     <table class="table is-bordered is-striped is-narrow is-hoverable is-fullwidth">
                         <thead>
                             <tr>