Nebucatnetzer
/
network_inventory
mirror of https://github.com/Nebucatnetzer/network_inventory.git
1
0
Fork 0
Code Issues Releases Wiki Activity

change the disks variable to a list 

Since a computer can contain multiple different types of disks this
needs to be a list
This commit is contained in:
Andreas Zweili 2017-12-26 11:13:14 +01:00
parent 0afdc4d716
commit 8f2ecb1a52
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docs/docs.org
View File

@ -420,13 +420,13 @@ def device_details(request, device_id):
def computer_details(request, computer_id):
computer = get_object_or_404(Computer, pk=computer_id)
disks = ComputerDiskRelation.objects.get(computer=computer_id)
disks_list = ComputerDiskRelation.objects.filter(computer=computer_id)
ram = ComputerRamRelation.objects.get(computer=computer_id)
cpu = ComputerCpuRelation.objects.get(computer=computer_id)
cronjob_list = CronJob.objects.filter(host=computer_id)
return render(request, 'inventory/computer_details.html',
{'computer': computer,
'disks': disks,
'disks_list': disks_list,
'ram': ram,
'cpu': cpu,
'cronjob_list': cronjob_list})
@ -587,7 +587,16 @@ The computer details show all the known information about the selected computer.
<p><b>CPU:</b> {{ cpu.cpu }}</p>
<p><b>RAM Modules: </b>{{ram.amount}}x {{ ram.ram }}</p>
<p><b>IP:</b> {{ computer.ip }}</p>
<p><b>Disks:</b> {{ disks.disk }}</p>
{% if disks_list %}
<p><b>Disks:</b></p>
<p>
<ul>
{% for disk in disks_list %}
<li>{{ disk.amount }}x {{ disk.disk }}</li>
{% endfor %}
</ul>
</p>
{% endif %}
<p><b>Host:</b> {{ computer.host }}</p>
#+END_SRC

11
inventory/templates/inventory/computer_details.html
View File

@ -7,7 +7,16 @@
<p><b>CPU:</b> {{ cpu.cpu }}</p>
<p><b>RAM Modules: </b>{{ram.amount}}x {{ ram.ram }}</p>
<p><b>IP:</b> {{ computer.ip }}</p>
<p><b>Disks:</b> {{ disks.disk }}</p>
{% if disks_list %}
<p><b>Disks:</b></p>
<p>
<ul>
{% for disk in disks_list %}
<li>{{ disk.amount }}x {{ disk.disk }}</li>
{% endfor %}
</ul>
</p>
{% endif %}
<p><b>Host:</b> {{ computer.host }}</p>
{% if cronjob_list %}
<p><b>Cron Jobs:</b></p>

4
inventory/views.py
View File

@ -24,13 +24,13 @@ def device_details(request, device_id):
def computer_details(request, computer_id):
computer = get_object_or_404(Computer, pk=computer_id)
disks = ComputerDiskRelation.objects.get(computer=computer_id)
disks_list = ComputerDiskRelation.objects.filter(computer=computer_id)
ram = ComputerRamRelation.objects.get(computer=computer_id)
cpu = ComputerCpuRelation.objects.get(computer=computer_id)
cronjob_list = CronJob.objects.filter(host=computer_id)
return render(request, 'inventory/computer_details.html',
{'computer': computer,
'disks': disks,
'disks_list': disks_list,
'ram': ram,
'cpu': cpu,
'cronjob_list': cronjob_list})