From fc2a7528032d4a72ee7326851cf45b140335e337 Mon Sep 17 00:00:00 2001
From: Andreas Zweili <andreas@2li.ch>
Date: Sun, 12 Jan 2020 16:55:16 +0100
Subject: [PATCH] rename query variables

---
 .../templates/computers/computer_details.html | 32 +++++++++----------
 computers/views.py                            | 22 ++++++-------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/computers/templates/computers/computer_details.html b/computers/templates/computers/computer_details.html
index 136ba64..216bb52 100644
--- a/computers/templates/computers/computer_details.html
+++ b/computers/templates/computers/computer_details.html
@@ -56,21 +56,21 @@
     </table>
     </div>
     </div>
-    {% if software_list or backup_list %}
+    {% if software_relations or backup_relations or license_list %}
     <div class="card">
     <div class="content">
-    {% if software_list %}
+    {% if software_relations %}
     <div class="header">Software</div>
     <ul>
-    {% for software in software_list %}
-        <li>{{ software.software }}</li>
+    {% for relation in software_relations %}
+        <li>{{ relation.software }}</li>
     {% endfor %}
     </ul>
     {% endif %}
-    {% if licenses %}
+    {% if license_list %}
     <div class="header">Licenses</div>
     <table class="ui celled table">
-    {% for license in licenses %}
+    {% for license in license_list %}
     <tr>
         <td>{{ license.license.software }}</td>
         <td><code>{{ license.license.key }}</code></td>
@@ -78,10 +78,10 @@
     {% endfor %}
     </table>
     {% endif %}
-    {% if backup_list %}
+    {% if backup_relations %}
     <div class="header">Backup</div>
     <ul>
-        {% for backup in backup_list %}
+        {% for backup in backup_relations %}
         <li><a href="{% url 'backup' backup.id %}">{{ backup }}</a></li>
         {% endfor %}
     </ul>
@@ -90,37 +90,37 @@
     </div>
     {% endif %}
 
-    {% if cpu_list or ram_list or disks_list or raid_disk_pairs or computer.host %}
+    {% if cpu_relations or ram_relations or disks_relations or raid_disk_pairs or computer.host %}
     <div class="card">
     <div class="content">
-    {% if cpu_list or ram_list or disks_list or computer.host %}
+    {% if cpu_relations or ram_relations or disks_relations or computer.host %}
     <div class="header">Hardware</div>
     <table class="ui celled table">
-    {% if cpu_list %}
+    {% if cpu_relations %}
         <tr>
             <td><b>CPUs:</b></td>
             <td>
-            {% for cpu in cpu_list %}
+            {% for cpu in cpu_relations %}
                 {{ cpu.amount }}x {{ cpu.cpu }}<br>
             {% endfor %}
             </td>
         </tr>
     {% endif %}
-    {% if ram_list %}
+    {% if ram_relations %}
         <tr>
         <td><b>RAM Modules:</b></td>
         <td>
-            {% for module in ram_list %}
+            {% for module in ram_relations %}
                 {{ module.amount }}x {{ module.ram }}<br>
             {% endfor %}
         </td>
     </tr>
     {% endif %}
-    {% if disks_list %}
+    {% if disks_relations %}
     <tr>
     <td><b>Disks:</b></td>
     <td>
-            {% for disk in disks_list %}
+            {% for disk in disks_relations %}
                 {{ disk.amount }}x {{ disk.disk }}<br>
             {% endfor %}
     </td>
diff --git a/computers/views.py b/computers/views.py
index 8c0e268..5a26ecb 100644
--- a/computers/views.py
+++ b/computers/views.py
@@ -29,23 +29,23 @@ from .tables import ComputersTable
 @computer_view_permission
 def computer_detail_view(request, pk):
     computer = get_object_or_404(Computer, pk=pk)
-    disks_list = ComputerDiskRelation.objects.filter(computer=pk)
-    ram_list = ComputerRamRelation.objects.filter(computer=pk)
-    cpu_list = ComputerCpuRelation.objects.filter(computer=pk)
-    software_list = ComputerSoftwareRelation.objects.filter(computer=pk)
-    licenses = LicenseWithComputer.objects.filter(computer=pk)
+    disks_relations = ComputerDiskRelation.objects.filter(computer=pk)
+    ram_relations = ComputerRamRelation.objects.filter(computer=pk)
+    cpu_relations = ComputerCpuRelation.objects.filter(computer=pk)
+    software_relations = ComputerSoftwareRelation.objects.filter(computer=pk)
+    license_list = LicenseWithComputer.objects.filter(computer=pk)
     raid_disk_pairs = {}
     for raid in Raid.objects.filter(computer=pk):
         raid_disk_pairs[raid] = DisksInRaid.objects.filter(raid=raid)
     backup_list = Backup.objects.filter(computer=pk)
     context = {'computer': computer,
-               'disks_list': disks_list,
-               'ram_list': ram_list,
-               'cpu_list': cpu_list,
-               'software_list': software_list,
+               'disks_relations': disks_relations,
+               'ram_relations': ram_relations,
+               'cpu_relations': cpu_relations,
+               'software_relations': software_relations,
                'raid_disk_pairs': raid_disk_pairs,
-               'backup_list': backup_list,
-               'licenses': licenses}
+               'backup_relations': backup_list,
+               'license_list': license_list}
     return render(request, 'computers/computer_details.html', context)