add raid disks to computer_detail_view

network_inventory/inventory/templates/inventory/computer_details.html

@@ -116,9 +116,9 @@
     {% endif %}
     </table>
 
-    {% if raid_relations %}
+    {% if raid_disk_pairs %}
     <div class="header">RAID</div>
-    {% for raid in raid_relations %}
+    {% for raid, disks in raid_disk_pairs.items %}
     <table class="ui celled table">
         <tr>
             <th><b>Type:</b></th>
@@ -128,6 +128,18 @@
             <th><b>Usable Space</b></th>
             <td>{{ raid.usable_space}}</td>
         </tr>
+        {% if disks %}
+        {% for disk in disks %}
+        <tr>
+            <td><b>Disk Type</b></td>
+            <td>{{ disk.disk }}</td>
+        </tr>
+        <tr>
+            <td><b>Amount</b></td>
+            <td>{{ disk.disk_amount }}</td>
+        </tr>
+        {% endfor %}
+        {% endif %}
     </table>
     {% endfor %}
     {% endif %}

network_inventory/inventory/views.py

@@ -27,6 +27,7 @@ from .models import ComputerSoftwareRelation
 from .models import Customer
 from .models import Device
 from .models import DeviceInNet
+from .models import DisksInRaid
 from .models import LicenseWithUser
 from .models import MailAlias
 from .models import Net
@@ -64,14 +65,16 @@ def computer_detail_view(request, pk):
     ram_list = ComputerRamRelation.objects.filter(computer=pk)
     cpu_list = ComputerCpuRelation.objects.filter(computer=pk)
     software_list = ComputerSoftwareRelation.objects.filter(computer=pk)
-    raid_relations = Raid.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,
-               'raid_relations': raid_relations,
+               'raid_disk_pairs': raid_disk_pairs,
                'backup_list': backup_list}
     return render(request, 'inventory/computer_details.html', context)