135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ND1#117] unknown devices missing from inventory

Browse Source
This commit is contained in:
Oliver Gorwits
2014-07-13 17:35:23 +01:00
parent 3ee27f0439
commit 769aa35044
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Netdisco/Changes
View File

@@ -2,6 +2,7 @@
[BUG FIXES] [BUG FIXES]
* [ND1#117] unknown devices missing from inventory
* [#118] Fix table rendering on port search tab when VLAN is null * [#118] Fix table rendering on port search tab when VLAN is null
2.028000 - 2014-07-01 2.028000 - 2014-07-01

12
Netdisco/share/views/inventory.tt
View File

@@ -13,17 +13,21 @@
</thead> </thead>
<tbody> <tbody>
[% FOREACH platform IN models.all %] [% FOREACH platform IN models.all %]
[% NEXT UNLESS platform.vendor AND platform.model %] [% NEXT UNLESS platform.vendor OR platform.model %]
<tr> <tr>
<th> <th>
[% IF platform.vendor %]
<a class="nd_linkcell" <a class="nd_linkcell"
href="[% search_device %]&q=[% platform.vendor | uri %]&vendor=[% platform.vendor | uri %]"> href="[% search_device %]&q=[% platform.vendor | uri %]&vendor=[% platform.vendor | uri %]">
[% platform.vendor | html_entity %]</a> [% platform.vendor | html_entity %]</a>
[% ELSE %]unknown[% END %]
</th> </th>
<th> <th>
[% IF platform.model %]
<a class="nd_linkcell" <a class="nd_linkcell"
href="[% search_device %]&q=[% platform.model | uri %]&model=[% platform.model | uri %]"> href="[% search_device %]&q=[% platform.model | uri %]&model=[% platform.model | uri %]">
[% platform.model | html_entity %]</a> [% platform.model | html_entity %]</a>
[% ELSE %]unknown[% END %]
</th> </th>
<th>[% platform.get_column('count') | html_entity %]</th> <th>[% platform.get_column('count') | html_entity %]</th>
</tr> </tr>
@@ -43,13 +47,15 @@
</thead> </thead>
<tbody> <tbody>
[% FOREACH release IN releases.all %] [% FOREACH release IN releases.all %]
[% NEXT UNLESS (release.os AND release.os_ver) %] [% NEXT UNLESS (release.os OR release.os_ver) %]
<tr> <tr>
<th>[% release.os | html_entity %]</th> <th>[% release.os || 'unknown' | html_entity %]</th>
<th> <th>
[% IF release.os_ver %]
<a class="nd_linkcell" <a class="nd_linkcell"
href="[% search_device %]&q=[% release.os_ver | uri %]&os_ver=[% release.os_ver | uri %]"> href="[% search_device %]&q=[% release.os_ver | uri %]&os_ver=[% release.os_ver | uri %]">
[% release.os_ver | html_entity %]</a> [% release.os_ver | html_entity %]</a>
[% ELSE %]unknown[% END %]
</th> </th>
<th>[% release.get_column('count') | html_entity %]</th> <th>[% release.get_column('count') | html_entity %]</th>
</tr> </tr>