itsdave/msp
2
0
Fork 0
mirror of https://github.com/itsdave-de/msp.git synced 2025-05-06 15:35:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

#25 | Fix ips not shown when no it object was assigned and improve table UI

Browse Source
This commit is contained in:
Jordi Albert 2022-08-26 12:50:27 +02:00
parent 097c9b9ef5
commit 8f0e7c6ce4
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
msp/msp/doctype/ip_network/ip_network.js
View File

@ -30,31 +30,31 @@ function getUsedIpsInNetwork(frm) {
tableBody += ` tableBody += `
<tr> <tr>
<td <td
style="border: 1px solid #000; padding: 0.5rem 1rem; text-align: left; ${element?.ip_address_name ? 'cursor: pointer;' : ''}" ${element?.ip_address_name ? 'style="cursor: pointer;"' : ''}
data-doctype-name="${element?.ip_address_name ?? ''}" data-doctype-name="${element?.ip_address_name ?? ''}"
data-doctype-type="IP Address" data-doctype-type="IP Address"
> >
${(element?.ip_address === '') ? "-" : element?.ip_address} ${(element?.ip_address === '') ? "-" : element?.ip_address}
</td> </td>
<td <td
style="border: 1px solid #000; padding: 0.5rem 1rem; text-align: left; ${element?.ip_address_name ? 'cursor: pointer;' : ''}" ${element?.ip_address_name ? 'style="cursor: pointer; text-decoration: underline;"' : ''}
data-doctype-name="${element?.it_object_name ?? ''}" data-doctype-name="${element?.it_object_name ?? ''}"
data-doctype-type="IT Object" data-doctype-type="IT Object"
> >
${(element?.title === '') ? "-" : element?.title} ${(element?.title === '') ? __("no object assigned") : element?.title}
</td> </td>
<td style="border: 1px solid #000; padding: 0.5rem 1rem; text-align: left;">${(element?.type === '') ? "-" : element?.type}</td> <td style="">${(element?.type === '') ? __("no type assigned") : element?.type}</td>
</tr> </tr>
`; `;
}); });
const table = tableBody ? ` const table = tableBody ? `
<table style="border-collapse: collapse; border: 2px solid #000; text-align: left; width: 100%; color: #000;"> <table style="" class="table table-striped table-bordered">
<thead> <thead class="thead-dark">
<tr> <tr>
<th scope="col" style="border: 1px solid #000; padding: 0.5rem 1rem;">IP</th> <th scope="col">IP</th>
<th scope="col" style="border: 1px solid #000; padding: 0.5rem 1rem;">Name</th> <th scope="col">Name</th>
<th scope="col" style="border: 1px solid #000; padding: 0.5rem 1rem;">Type</th> <th scope="col">Type</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

2
msp/msp/doctype/ip_network/ip_network.py
View File

@ -20,7 +20,7 @@ class IPNetwork(Document):
ito.title, ito.title,
ito.type ito.type
FROM `tabIP Address` ipa FROM `tabIP Address` ipa
JOIN `tabIT Object` ito LEFT JOIN `tabIT Object` ito
ON ipa.it_object = ito.name ON ipa.it_object = ito.name
WHERE ipa.ip_network = %(ip_network)s WHERE ipa.ip_network = %(ip_network)s
AND ito.status != %(status)s AND ito.status != %(status)s