瀏覽代碼

Fixes #6771: Add count of inventory items to manufacturer view

jeremystretch 4 年之前
父節點
當前提交
78e282d406
共有 3 個文件被更改,包括 11 次插入0 次删除
  1. 1 0
      docs/release-notes/version-2.11.md
  2. 4 0
      netbox/dcim/views.py
  3. 6 0
      netbox/templates/dcim/manufacturer.html

+ 1 - 0
docs/release-notes/version-2.11.md

@@ -22,6 +22,7 @@
 
 ### Other Changes
 
+* [#6771](https://github.com/netbox-community/netbox/issues/6771) - Add count of inventory items to manufacturer view
 * [#6781](https://github.com/netbox-community/netbox/issues/6781) - Database query caching is now disabled by default
 
 ---

+ 4 - 0
netbox/dcim/views.py

@@ -695,6 +695,9 @@ class ManufacturerView(generic.ObjectView):
         ).annotate(
             instance_count=count_related(Device, 'device_type')
         )
+        inventory_items = InventoryItem.objects.restrict(request.user, 'view').filter(
+            manufacturer=instance
+        )
 
         devicetypes_table = tables.DeviceTypeTable(devicetypes)
         devicetypes_table.columns.hide('manufacturer')
@@ -702,6 +705,7 @@ class ManufacturerView(generic.ObjectView):
 
         return {
             'devicetypes_table': devicetypes_table,
+            'inventory_item_count': inventory_items.count(),
         }
 
 

+ 6 - 0
netbox/templates/dcim/manufacturer.html

@@ -29,6 +29,12 @@
             <a href="{% url 'dcim:devicetype_list' %}?manufacturer_id={{ object.pk }}">{{ devicetypes_table.rows|length }}</a>
           </td>
         </tr>
+        <tr>
+          <td>Inventory Items</td>
+          <td>
+            <a href="{% url 'dcim:inventoryitem_list' %}?manufacturer_id={{ object.pk }}">{{ inventory_item_count }}</a>
+          </td>
+        </tr>
       </table>
     </div>
     {% plugin_left_page object %}