PyInventory 0.23.1__tar.gz → 0.24.0__tar.gz

{pyinventory-0.23.1 → pyinventory-0.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyInventory
-Version: 0.23.1
+Version: 0.24.0
 Summary: Web based management to catalog things including state and location etc. using Python/Django.
 Project-URL: Documentation, https://github.com/jedie/PyInventory
 Project-URL: Source, https://github.com/jedie/PyInventory
@@ -199,6 +199,11 @@ To make a new release, do this:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.24.0](https://github.com/jedie/PyInventory/compare/v0.23.2...v0.24.0)
+  * 2025-12-02 - Use facets always and auto hide empty item filters
+  * 2025-12-02 - Update requirements
+* [v0.23.2](https://github.com/jedie/PyInventory/compare/v0.23.1...v0.23.2)
+  * 2025-11-28 - Fix logo if static path is not just "/static/"
 * [v0.23.1](https://github.com/jedie/PyInventory/compare/v0.23.0...v0.23.1)
   * 2025-11-28 - Update README.md
   * 2025-11-28 - Add logo
@@ -208,6 +213,9 @@ To make a new release, do this:
   * 2025-11-25 - Remove django-tagulous work-a-round, because it's fixed.
   * 2025-11-19 - Add admin action to change the category of selected items
   * 2025-11-19 - Remove "GHSA-4xh5-x5gv-qwph" exception
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.22.1](https://github.com/jedie/PyInventory/compare/v0.22.0...v0.22.1)
   * 2025-11-18 - Fix #207 "All" Category can't be selected
   * 2025-11-18 - Update requirements
@@ -215,9 +223,6 @@ To make a new release, do this:
   * 2025-10-16 - Add tests for PersistentRelatedFieldListFilter
   * 2025-09-21 - NEW: Add a persistent "Main Category"
   * 2025-09-21 - fix for django-admin-sortable2/issues/363
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.21.4](https://github.com/jedie/PyInventory/compare/v0.21.3...v0.21.4)
   * 2025-09-21 - Because of PyPi download errors: release as v0.21.4
 * [v0.21.3](https://github.com/jedie/PyInventory/compare/v0.21.2...v0.21.3)

{pyinventory-0.23.1 → pyinventory-0.24.0}/README.md

@@ -169,6 +169,11 @@ To make a new release, do this:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.24.0](https://github.com/jedie/PyInventory/compare/v0.23.2...v0.24.0)
+  * 2025-12-02 - Use facets always and auto hide empty item filters
+  * 2025-12-02 - Update requirements
+* [v0.23.2](https://github.com/jedie/PyInventory/compare/v0.23.1...v0.23.2)
+  * 2025-11-28 - Fix logo if static path is not just "/static/"
 * [v0.23.1](https://github.com/jedie/PyInventory/compare/v0.23.0...v0.23.1)
   * 2025-11-28 - Update README.md
   * 2025-11-28 - Add logo
@@ -178,6 +183,9 @@ To make a new release, do this:
   * 2025-11-25 - Remove django-tagulous work-a-round, because it's fixed.
   * 2025-11-19 - Add admin action to change the category of selected items
   * 2025-11-19 - Remove "GHSA-4xh5-x5gv-qwph" exception
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.22.1](https://github.com/jedie/PyInventory/compare/v0.22.0...v0.22.1)
   * 2025-11-18 - Fix #207 "All" Category can't be selected
   * 2025-11-18 - Update requirements
@@ -185,9 +193,6 @@ To make a new release, do this:
   * 2025-10-16 - Add tests for PersistentRelatedFieldListFilter
   * 2025-09-21 - NEW: Add a persistent "Main Category"
   * 2025-09-21 - fix for django-admin-sortable2/issues/363
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.21.4](https://github.com/jedie/PyInventory/compare/v0.21.3...v0.21.4)
   * 2025-09-21 - Because of PyPi download errors: release as v0.21.4
 * [v0.21.3](https://github.com/jedie/PyInventory/compare/v0.21.2...v0.21.3)

{pyinventory-0.23.1 → pyinventory-0.24.0}/inventory/__init__.py

@@ -8,5 +8,5 @@
 """
 
 # See https://packaging.python.org/en/latest/specifications/version-specifiers/
-__version__ = '0.23.1'
+__version__ = '0.24.0'
 __author__ = 'Jens Diemer <PyInventory@jensdiemer.de>'

{pyinventory-0.23.1 → pyinventory-0.24.0}/inventory/admin/base.py

@@ -19,6 +19,7 @@ class UserInlineMixin:
 
 
 class BaseUserAdmin(CompareVersionAdmin):
+    show_facets = admin.ShowFacets.ALWAYS
     form = OnlyUserRelationsModelForm
 
     def get_changelist(self, request, **kwargs):
@@ -102,3 +103,38 @@ class LimitTreeDepthListFilter(admin.SimpleListFilter):
         if level:
             level = int(level)
             return queryset.filter(level__lte=level)
+
+
+class NoneEmptyRelatedFieldListFilter(admin.RelatedOnlyFieldListFilter):
+    """
+    Display only choices that results **not** in an empty change list!
+    """
+
+    def choices(self, changelist):
+        assert changelist.add_facets, f'Facets must be enabled to use {self.__class__.__name__}'
+
+        facet_counts = self.get_facet_queryset(changelist)
+        yield {
+            'selected': self.lookup_val is None and not self.lookup_val_isnull,
+            'query_string': changelist.get_query_string(remove=[self.lookup_kwarg, self.lookup_kwarg_isnull]),
+            'display': _('All'),
+        }
+        for pk_val, val in self.lookup_choices:
+            if count := facet_counts[f'{pk_val}__c']:
+                yield {
+                    'selected': self.lookup_val is not None and str(pk_val) in self.lookup_val,
+                    'query_string': changelist.get_query_string(
+                        {self.lookup_kwarg: pk_val}, [self.lookup_kwarg_isnull]
+                    ),
+                    'display': f'{val} ({count})',
+                }
+
+        if self.include_empty_choice:
+            if count := facet_counts['__c']:
+                yield {
+                    'selected': bool(self.lookup_val_isnull),
+                    'query_string': changelist.get_query_string(
+                        {self.lookup_kwarg_isnull: 'True'}, [self.lookup_kwarg]
+                    ),
+                    'display': f'{self.empty_value_display} ({count})',
+                }

{pyinventory-0.23.1 → pyinventory-0.24.0}/inventory/admin/item.py

@@ -19,6 +19,7 @@ from inventory.admin.base import (
     BaseImageModelInline,
     BaseUserAdmin,
     LimitTreeDepthListFilter,
+    NoneEmptyRelatedFieldListFilter,
     UserInlineMixin,
 )
 from inventory.models import ItemLinkModel, ItemModel
@@ -150,10 +151,10 @@ class ItemModelAdmin(ImportExportMixin, SortableAdminBase, BaseUserAdmin):
     list_filter = (
         ('category', PersistentRelatedFieldListFilter),
         LimitTreeDepthListFilter,
-        ('kind', admin.RelatedOnlyFieldListFilter),
-        ('location', admin.RelatedOnlyFieldListFilter),
-        ('producer', admin.RelatedOnlyFieldListFilter),
-        ('tags', admin.RelatedOnlyFieldListFilter),
+        ('kind', NoneEmptyRelatedFieldListFilter),
+        ('location', NoneEmptyRelatedFieldListFilter),
+        ('producer', NoneEmptyRelatedFieldListFilter),
+        ('tags', NoneEmptyRelatedFieldListFilter),
     )
     search_fields = ('name', 'description', 'kind__name', 'tags__name')
     fieldsets = (

{pyinventory-0.23.1 → pyinventory-0.24.0}/inventory/static/inventory.css

@@ -1,10 +1,3 @@
-#site-name {
-    background: url('/static/PyInventory_Logo.svg') no-repeat left center;
-    height: 48px;
-    padding: 0 0 0 70px;
-    display: flex;
-    align-items: center;
-}
 #footer {
     text-align: center;
     border-top: 2px solid var(--secondary);

{pyinventory-0.23.1 → pyinventory-0.24.0}/inventory/tests/test_admin_location_empty_change_list_1.snapshot.html

@@ -50,13 +50,6 @@
     <h2 id="changelist-filter-header">
      Filter
     </h2>
-    <div id="changelist-filter-extra-actions">
-     <h3>
-      <a class="viewlink" href="?_facets=True">
-       Show counts
-      </a>
-     </h3>
-    </div>
     <details data-filter-title="Limit tree depth" open="">
      <summary>
       By Limit tree depth
@@ -69,17 +62,17 @@
       </li>
       <li>
        <a href="?level=1">
-        Only root
+        Only root (0)
        </a>
       </li>
       <li>
        <a href="?level=2">
-        Root + first sub
+        Root + first sub (0)
        </a>
       </li>
       <li>
        <a href="?level=3">
-        Root + first + second sub
+        Root + first + second sub (0)
        </a>
       </li>
      </ul>

{pyinventory-0.23.1 → pyinventory-0.24.0}/inventory_project/templates/admin/base_site.html

@@ -12,7 +12,10 @@
 
 {% block branding %}
 <h1 id="site-name">
-    <a href="{% url 'admin:index' %}">PyInventory {{ inventory_version_string }}</a>
+    <a href="{% url 'admin:index' %}">
+        <img src="{% static 'PyInventory_Logo.svg' %}" alt="Logo">
+        PyInventory {{ inventory_version_string }}
+    </a>
 </h1>
 {% endblock %}
 

{pyinventory-0.23.1 → pyinventory-0.24.0}/inventory_project/tests/test_admin_item.py

@@ -265,28 +265,27 @@ class AdminTestCase(HtmlAssertionMixin, TestCase):
         )
         with self.assertLogs('inventory.persistent_filters', level=logging.DEBUG) as logs:
             response = self.client.get(path='/admin/inventory/itemmodel/')
-
-        self.assertEqual(
-            list(response.context_data['cl'].queryset.values_list('name', flat=True)), ['Item 1', 'Item 2']
-        )
-        self.assert_html_parts(
-            response,
-            parts=(
-                '<h1>Select Item to change</h1>',
-                '<a href="/admin/inventory/itemmodel/80dddef9-0000-0000-0000-000000000001/change/">'
-                '<strong>Item 1</strong></a>',
-                '<a href="/admin/inventory/itemmodel/80dddef9-0000-0000-0000-000000000002/change/">'
-                '<strong>Item 2</strong></a>',
-                '<a href="?category__id__exact=1">Category 1</a>',
-                '<a href="?category__id__exact=2">Category 2</a>',
-            ),
-        )
+            self.assertEqual(
+                list(response.context_data['cl'].queryset.values_list('name', flat=True)), ['Item 1', 'Item 2']
+            )
+            self.assert_html_parts(
+                response,
+                parts=(
+                    '<h1>Select Item to change</h1>',
+                    '<a href="/admin/inventory/itemmodel/80dddef9-0000-0000-0000-000000000001/change/">'
+                    '<strong>Item 1</strong></a>',
+                    '<a href="/admin/inventory/itemmodel/80dddef9-0000-0000-0000-000000000002/change/">'
+                    '<strong>Item 2</strong></a>',
+                    '<a href="?category__id__exact=1">Category 1 (1)</a>',
+                    '<a href="?category__id__exact=2">Category 2 (1)</a>',
+                ),
+            )
         self.assertEqual(
             logs.output,
             [
                 'DEBUG:inventory.persistent_filters:'
                 "Restore None from 'persistent_parameter_1_inventory_itemmodel_category__id__exact'"
-            ],
+            ] * 3,  # 3 times called because of facet counts :(
         )
 
         with self.assertLogs('inventory.persistent_filters', level=logging.DEBUG) as logs:
@@ -296,7 +295,7 @@ class AdminTestCase(HtmlAssertionMixin, TestCase):
             [
                 'DEBUG:inventory.persistent_filters:'
                 "Store '2' to 'persistent_parameter_1_inventory_itemmodel_category__id__exact'"
-            ],
+            ] * 3,  # 3 times called because of facet counts :(
         )
         # Only items from category 2:
         self.assertEqual(list(response.context_data['cl'].queryset.values_list('name', flat=True)), ['Item 2'])
@@ -310,7 +309,7 @@ class AdminTestCase(HtmlAssertionMixin, TestCase):
                 "DEBUG:inventory.persistent_filters:"
                 "Restore '2' from 'persistent_parameter_1_inventory_itemmodel_category__id__exact'",
                 "INFO:inventory.persistent_filters:Restore 'category' filter for itemmodel with '2'",
-            ],
+            ] * 3,  # 3 times called because of facet counts :(
         )
         # Only items from category 2:
         self.assertEqual(list(response.context_data['cl'].queryset.values_list('name', flat=True)), ['Item 2'])
@@ -323,7 +322,7 @@ class AdminTestCase(HtmlAssertionMixin, TestCase):
             [
                 'DEBUG:inventory.persistent_filters:'
                 "Store '1' to 'persistent_parameter_1_inventory_itemmodel_category__id__exact'"
-            ],
+            ] * 3,  # 3 times called because of facet counts :(
         )
         # Only items from category 1:
         self.assertEqual(list(response.context_data['cl'].queryset.values_list('name', flat=True)), ['Item 1'])

{pyinventory-0.23.1 → pyinventory-0.24.0}/inventory_project/tests/test_admin_item_auto_group_items_1.snapshot.html

@@ -338,13 +338,6 @@
     <h2 id="changelist-filter-header">
      Filter
     </h2>
-    <div id="changelist-filter-extra-actions">
-     <h3>
-      <a class="viewlink" href="?_facets=True">
-       Show counts
-      </a>
-     </h3>
-    </div>
     <details data-filter-title="Limit tree depth" open="">
      <summary>
       By Limit tree depth
@@ -357,17 +350,17 @@
       </li>
       <li>
        <a href="?level=1">
-        Only root
+        Only root (2)
        </a>
       </li>
       <li>
        <a href="?level=2">
-        Root + first sub
+        Root + first sub (6)
        </a>
       </li>
       <li>
        <a href="?level=3">
-        Root + first + second sub
+        Root + first + second sub (6)
        </a>
       </li>
      </ul>

{pyinventory-0.23.1 → pyinventory-0.24.0}/inventory_project/tests/test_admin_item_normal_user_create_minimal_item_2.snapshot.html

@@ -76,6 +76,7 @@
     <div id="branding">
      <h1 id="site-name">
       <a href="/admin/">
+       <img alt="Logo" src="/static/PyInventory_Logo.svg"/>
        PyInventory vMockedVersionString
       </a>
      </h1>