move each IP into it's own table row
there where too many complications with creating the urls and the various buttons. This way may be a bit less pretty but for the moments it's a much stabler way
This commit is contained in:
parent
bfc6499f96
commit
e1a5c572d8
|
@ -14,6 +14,7 @@ from core import utils
|
|||
from backups.models import Backup
|
||||
from customers.models import Customer
|
||||
from customers.decorators import customer_view_permission
|
||||
from devices.models import DeviceInNet
|
||||
from devices.models import Warranty
|
||||
from licenses.models import LicenseWithComputer
|
||||
|
||||
|
@ -45,6 +46,7 @@ def computer_detail_view(request, pk):
|
|||
gpu_relations = ComputerGpuRelation.objects.filter(computer=pk)
|
||||
software_relations = ComputerSoftwareRelation.objects.filter(computer=pk)
|
||||
license_list = LicenseWithComputer.objects.filter(computer=pk)
|
||||
net_relations = DeviceInNet.objects.filter(device=pk)
|
||||
raid_disk_pairs = {}
|
||||
for raid in Raid.objects.filter(computer=pk):
|
||||
raid_disk_pairs[raid] = DisksInRaid.objects.filter(raid=raid)
|
||||
|
@ -59,6 +61,7 @@ def computer_detail_view(request, pk):
|
|||
'raid_disk_pairs': raid_disk_pairs,
|
||||
'backup_relations': backup_list,
|
||||
'license_list': license_list,
|
||||
'net_relations': net_relations,
|
||||
'pk': pk}
|
||||
return render(request, 'computers/computer_details.html', context)
|
||||
|
||||
|
|
|
@ -2,15 +2,15 @@
|
|||
<h2 class="card-header">IPs <a href="{% url 'device_in_net_create' pk %}" class="add" title="Add" data-toggle="tooltip"><i class="material-icons">add</i></a></h2>
|
||||
<div class="card-body">
|
||||
<table class="table table-bordered">
|
||||
{% if device.nets %}
|
||||
{% regroup device.nets by name as nets_list %}
|
||||
{% for net in nets_list %}
|
||||
{% if net_relations %}
|
||||
{% for net in net_relations %}
|
||||
<tr>
|
||||
<td><b>{{ net.grouper }}</b></td>
|
||||
<td><b>{{ net.net }}</b></td>
|
||||
<td>
|
||||
{% for ip in net.list %}
|
||||
<a href="{% url 'net' ip.net_id %}">{{ ip.ip }}</a><br>
|
||||
{% endfor %}
|
||||
<a href="{% url 'net' net.net.pk %}">{{ net.ip }}</a><br>
|
||||
</td>
|
||||
<td>
|
||||
<a href="{% url 'device_in_net_update' net.pk %}" class="edit" title="Edit" data-toggle="tooltip"><i class="material-icons">edit</i></a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
|
|
@ -34,10 +34,12 @@ from .tables import WarrantiesTable
|
|||
def device_detail_view(request, pk):
|
||||
device = get_object_or_404(Device, pk=pk)
|
||||
warranty_relations = Warranty.objects.filter(device=pk)
|
||||
net_relations = DeviceInNet.objects.filter(device=pk)
|
||||
return render(request,
|
||||
'devices/device_details.html',
|
||||
{'device': device,
|
||||
'warranty_relations': warranty_relations,
|
||||
'net_relations': net_relations,
|
||||
'pk': pk})
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue