task #2739 Manufacter and Model empty instead of None
This commit is contained in:
parent
a45fd815a2
commit
c6538333f7
|
@ -246,7 +246,7 @@
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<a href="{{ url_for('inventory.devices.device_details', id=dev.devicehub_id)}}">
|
<a href="{{ url_for('inventory.devices.device_details', id=dev.devicehub_id)}}">
|
||||||
{{ dev.type }} {{ dev.manufacturer }} {{ dev.model }}
|
{{ dev.type }} {{ dev.manufacturer|d('', true) }} {{ dev.model|d('', true) }}
|
||||||
</a>
|
</a>
|
||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
<div class="col-lg-9 col-md-8">
|
<div class="col-lg-9 col-md-8">
|
||||||
{% if tag.device %}
|
{% if tag.device %}
|
||||||
<a href="{{url_for('inventory.devices.device_details', id=tag.device.devicehub_id)}}">
|
<a href="{{url_for('inventory.devices.device_details', id=tag.device.devicehub_id)}}">
|
||||||
{{ tag.device.manufacturer }} {{ tag.device.model }}
|
{{ tag.device.type }} {{ tag.device.manufacturer|d('', true) }} {{ tag.device.model|d('', true) }}
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -59,7 +59,7 @@
|
||||||
<td>
|
<td>
|
||||||
{% if tag.device %}
|
{% if tag.device %}
|
||||||
<a href={{ url_for('inventory.devices.device_details', id=tag.device.devicehub_id)}}>
|
<a href={{ url_for('inventory.devices.device_details', id=tag.device.devicehub_id)}}>
|
||||||
{{ tag.device.type }} {{ tag.device.manufacturer }} {{ tag.device.model }}
|
{{ tag.device.type }} {{ tag.device.manufacturer|d('', true) }} {{ tag.device.model|d('', true) }}
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
|
|
Reference in New Issue