Merge v2.11.8 changes

2025-12-21 12:52:21 -06:00 · 2021-07-06 12:10:29 -04:00
parent 57fc6efd4c c585175214
commit 88e382e7a1
40 changed files with 264 additions and 133 deletions
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -142,7 +142,7 @@
                        <th scope="row"><i class="mdi mdi-chip"></i> Memory</th>
                        <td>
                            {% if object.memory %}
-                                {{ object.memory }} MB
+                                {{ object.memory|humanize_megabytes }} MB
                            {% else %}
                                <span class="text-muted">&mdash;</span>
                            {% endif %}