allow empty relations for RAM and CPUs

This commit is contained in:
Andreas Zweili 2019-06-16 22:54:25 +02:00
parent ff75b95427
commit 8b7c4262ad
2 changed files with 24 additions and 6 deletions

View File

@ -4,8 +4,26 @@
<h3>Description</h3>
<p>{{ computer.description }}</p>
<p><b>OS: </b>{{ computer.os }}</p>
<p><b>CPU: </b>{{ cpu.amount }}x {{ cpu.cpu }}</p>
<p><b>RAM Modules: </b>{{ ram.amount }}x {{ ram.ram }}</p>
{% if cpu_list %}
<p><b>CPUs:</b></p>
<p>
<ul>
{% for cpu in cpu_list %}
<li>{{ cpu.amount }}x {{ cpu.cpu }}</li>
{% endfor %}
</ul>
</p>
{% endif %}
{% if ram_list %}
<p><b>RAM Modules:</b></p>
<p>
<ul>
{% for module in ram_list %}
<li>{{ module.amount }}x {{ module.ram }}</li>
{% endfor %}
</ul>
</p>
{% endif %}
{% if disks_list %}
<p><b>Disks:</b></p>
<p>

View File

@ -19,13 +19,13 @@ def device_details(request, device_id):
def computer_details(request, computer_id):
computer = get_object_or_404(Computer, pk=computer_id)
disks_list = ComputerDiskRelation.objects.filter(computer=computer_id)
ram = ComputerRamRelation.objects.get(computer=computer_id)
cpu = ComputerCpuRelation.objects.get(computer=computer_id)
ram_list = ComputerRamRelation.objects.filter(computer=computer_id)
cpu_list = ComputerCpuRelation.objects.filter(computer=computer_id)
return render(request, 'inventory/computer_details.html',
{'computer': computer,
'disks_list': disks_list,
'ram': ram,
'cpu': cpu})
'ram_list': ram_list,
'cpu_list': cpu_list})
class CustomerList(ListView):