PyInventory 0.21.4__tar.gz → 0.22.1__tar.gz

{pyinventory-0.21.4 → pyinventory-0.22.1}/.gitignore

@@ -9,7 +9,6 @@ __pycache__
 !.github
 !.run
 !.editorconfig
-!.flake8
 !.gitignore
 !.pre-commit-config.yaml
 !.pre-commit-hooks.yaml
@@ -20,8 +19,8 @@ __pycache__
 !/backups/.gitkeep
 
 # from test projects:
-**/static/*
-**/media/*
+/static/
+/media/
 *.sqlite3
 *.json
 

{pyinventory-0.21.4 → pyinventory-0.22.1}/.pre-commit-config.yaml

@@ -2,6 +2,6 @@
 # See https://pre-commit.com for more information
 repos:
   - repo: https://github.com/jedie/cli-base-utilities
-    rev: v0.23.3
+    rev: v0.25.0
     hooks:
       - id: update-readme-history

{pyinventory-0.21.4 → pyinventory-0.22.1}/.run/Template Django tests.run.xml

@@ -6,6 +6,7 @@
     <option name="PARENT_ENVS" value="true" />
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
+      <env name="RAISE_SNAPSHOT_ERRORS" value="0" />
       <env name="DJANGO_SETTINGS_MODULE" value="inventory_project.settings.tests" />
     </envs>
     <option name="SDK_HOME" value="" />

{pyinventory-0.21.4 → pyinventory-0.22.1}/.run/manage.py --help.run.xml

@@ -10,8 +10,8 @@
     <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="false" />
+    <option name="ADD_SOURCE_ROOTS" value="false" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/manage.py" />
     <option name="PARAMETERS" value="--help" />

pyinventory-0.22.1/.run/manage.py make_messages.run.xml

@@ -0,0 +1,25 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="manage.py make_messages" type="PythonConfigurationType" factoryName="Python">
+    <module name="PyInventory" />
+    <option name="ENV_FILES" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="false" />
+    <option name="ADD_SOURCE_ROOTS" value="false" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/manage.py" />
+    <option name="PARAMETERS" value="make_messages" />
+    <option name="SHOW_COMMAND_LINE" value="false" />
+    <option name="EMULATE_TERMINAL" value="true" />
+    <option name="MODULE_MODE" value="false" />
+    <option name="REDIRECT_INPUT" value="false" />
+    <option name="INPUT_FILE" value="" />
+    <method v="2" />
+  </configuration>
+</component>

{pyinventory-0.21.4 → pyinventory-0.22.1}/.run/manage.py update_req.run.xml

@@ -10,8 +10,8 @@
     <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="false" />
+    <option name="ADD_SOURCE_ROOTS" value="false" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/manage.py" />
     <option name="PARAMETERS" value="update_req" />

{pyinventory-0.21.4 → pyinventory-0.22.1}/.run/unittests ___all___.run.xml

@@ -6,6 +6,7 @@
     <option name="PARENT_ENVS" value="true" />
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
+      <env name="RAISE_SNAPSHOT_ERRORS" value="0" />
       <env name="DJANGO_SETTINGS_MODULE" value="inventory_project.settings.tests" />
     </envs>
     <option name="SDK_HOME" value="" />

{pyinventory-0.21.4 → pyinventory-0.22.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyInventory
-Version: 0.21.4
+Version: 0.22.1
 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
@@ -196,6 +196,13 @@ To make a new release, do this:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [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
+* [v0.22.0](https://github.com/jedie/PyInventory/compare/v0.21.4...v0.22.0)
+  * 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
 * [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)
@@ -210,15 +217,15 @@ To make a new release, do this:
   * 2025-09-20 - pre-commit: remove "default_install_hook_types"
   * 2025-09-20 - Remove obsolete config files
   * 2025-09-20 - Update ReadmeHistoryTestCase
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.21.2](https://github.com/jedie/PyInventory/compare/v0.21.1...v0.21.2)
   * 2025-09-09 - Update project, e.g.: Darker -> Ruff and fix tests
   * 2025-05-01 - Fix local dev server: Don't enforce https
 * [v0.21.1](https://github.com/jedie/PyInventory/compare/v0.21.0...v0.21.1)
   * 2025-05-01 - Replace setuptools with hatchling
   * 2025-04-30 - Update requirements and some small code parts
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.21.0](https://github.com/jedie/PyInventory/compare/v0.20.1...v0.21.0)
   * 2025-03-23 - Bugfix publish: setuptools missing
   * 2025-03-23 - Migrate "pip-tools" -> "uv" and remove tox

{pyinventory-0.21.4 → pyinventory-0.22.1}/README.md

@@ -166,6 +166,13 @@ To make a new release, do this:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [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
+* [v0.22.0](https://github.com/jedie/PyInventory/compare/v0.21.4...v0.22.0)
+  * 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
 * [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)
@@ -180,15 +187,15 @@ To make a new release, do this:
   * 2025-09-20 - pre-commit: remove "default_install_hook_types"
   * 2025-09-20 - Remove obsolete config files
   * 2025-09-20 - Update ReadmeHistoryTestCase
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.21.2](https://github.com/jedie/PyInventory/compare/v0.21.1...v0.21.2)
   * 2025-09-09 - Update project, e.g.: Darker -> Ruff and fix tests
   * 2025-05-01 - Fix local dev server: Don't enforce https
 * [v0.21.1](https://github.com/jedie/PyInventory/compare/v0.21.0...v0.21.1)
   * 2025-05-01 - Replace setuptools with hatchling
   * 2025-04-30 - Update requirements and some small code parts
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.21.0](https://github.com/jedie/PyInventory/compare/v0.20.1...v0.21.0)
   * 2025-03-23 - Bugfix publish: setuptools missing
   * 2025-03-23 - Migrate "pip-tools" -> "uv" and remove tox

{pyinventory-0.21.4 → pyinventory-0.22.1}/inventory/__init__.py

@@ -3,10 +3,10 @@
     Web based management to catalog things including state and location etc. using Python/Django.
 
     created 14.20.2020 by Jens Diemer <opensource@jensdiemer.de>
-    :copyleft: 2020-2024 by the PyInventory team, see AUTHORS for more details.
+    :copyleft: 2020-2025 by the PyInventory team, see AUTHORS for more details.
     :license: GNU GPL v3 or above, see LICENSE for more details.
 """
 
 # See https://packaging.python.org/en/latest/specifications/version-specifiers/
-__version__ = '0.21.4'
+__version__ = '0.22.1'
 __author__ = 'Jens Diemer <PyInventory@jensdiemer.de>'

{pyinventory-0.21.4 → pyinventory-0.22.1}/inventory/admin/item.py

@@ -1,7 +1,7 @@
 import logging
 
 import tagulous
-from adminsortable2.admin import SortableAdminMixin, SortableInlineAdminMixin
+from adminsortable2.admin import SortableAdminBase, SortableAdminMixin, SortableInlineAdminMixin
 from django.conf import settings
 from django.contrib import admin
 from django.template.loader import render_to_string
@@ -20,13 +20,19 @@ from inventory.admin.base import (
 )
 from inventory.admin.tagulous_fix import TagulousModelAdminFix
 from inventory.models import ItemLinkModel, ItemModel
-from inventory.models.item import ItemFileModel, ItemImageModel
+from inventory.models.item import ItemFileModel, ItemImageModel, ItemMainCategory
+from inventory.persistent_filters import PersistentRelatedFieldListFilter
 from inventory.string_utils import ltruncatechars
 
 
 logger = logging.getLogger(__name__)
 
 
+@admin.register(ItemMainCategory)
+class ItemMainCategoryAdmin(SortableAdminMixin, admin.ModelAdmin):
+    list_display = ('order', 'name')
+
+
 class ItemLinkModelInline(UserInlineMixin, SortableInlineAdminMixin, admin.TabularInline):
     model = ItemLinkModel
     extra = 0
@@ -46,7 +52,7 @@ class ItemModelResource(ModelResource):
 
 
 @admin.register(ItemModel)
-class ItemModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminMixin, BaseUserAdmin):
+class ItemModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminBase, BaseUserAdmin):
     @admin.display(description=_('Related items'))
     def related_items(self, obj):
         if obj.pk is None:
@@ -95,6 +101,7 @@ class ItemModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminMixi
     ordering = ('path_str',)
     list_display_links = ()
     list_filter = (
+        ('category', PersistentRelatedFieldListFilter),
         LimitTreeDepthListFilter,
         ('kind', admin.RelatedOnlyFieldListFilter),
         ('location', admin.RelatedOnlyFieldListFilter),
@@ -118,7 +125,7 @@ class ItemModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminMixi
             _('Basic'),
             {
                 'fields': (
-                    'kind',
+                    ('category', 'kind'),
                     ('producer', 'name'),
                     'description',
                     'tags',
@@ -161,15 +168,5 @@ class ItemModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminMixi
     readonly_fields = ('id', 'create_dt', 'update_dt', 'user', 'related_items')
     inlines = (ItemImageModelInline, ItemFileModelInline, ItemLinkModelInline)
 
-    def get_list_display(self, request):
-        list_display = list(super().get_list_display(request))
-
-        # FIXME: SortableAdminMixin.get_list_display() adds this, we didn't need here:
-        # See: https://github.com/jrief/django-admin-sortable2/issues/363
-        if '_reorder_' in list_display:
-            list_display.remove('_reorder_')
-
-        return list_display
-
 
 tagulous.admin.enhance(ItemModel, ItemModelAdmin)

{pyinventory-0.21.4 → pyinventory-0.22.1}/inventory/locale/ca/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-30 20:48+0200\n"
+"POT-Creation-Date: 2025-10-16 10:51+0200\n"
 "PO-Revision-Date: 2022-09-30 20:07+0200\n"
 "Last-Translator: Jaume López\n"
 "Language-Team: \n"
@@ -102,6 +102,24 @@ msgstr "Nom"
 msgid "BaseItemAttachmentModel.name.help_text"
 msgstr ""
 
+msgid "ItemMainCategory.name.verbose_name"
+msgstr ""
+
+msgid "ItemMainCategory.name.help_text"
+msgstr " "
+
+msgid "ItemMainCategory.verbose_name"
+msgstr ""
+
+msgid "ItemMainCategory.verbose_name_plural"
+msgstr ""
+
+msgid "ItemModel.category.verbose_name"
+msgstr ""
+
+msgid "ItemModel.category.help_text"
+msgstr " "
+
 msgid "ItemModel.kind.verbose_name"
 msgstr "Tipus"
 

{pyinventory-0.21.4 → pyinventory-0.22.1}/inventory/locale/de/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-30 20:48+0200\n"
-"PO-Revision-Date: 2022-09-30 20:48+0200\n"
+"POT-Creation-Date: 2025-10-16 10:51+0200\n"
+"PO-Revision-Date: 2025-09-21 17:34+0200\n"
 "Last-Translator: Jens Diemer\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.4.2\n"
 
 msgid "Limit tree depth"
 msgstr "Tiefe des Baumes"
@@ -101,6 +101,24 @@ msgstr "Name"
 msgid "BaseItemAttachmentModel.name.help_text"
 msgstr "Optionalen Namen (Wird automatisch aus dem Dateinamen gesetzt)"
 
+msgid "ItemMainCategory.name.verbose_name"
+msgstr "Kategorie"
+
+msgid "ItemMainCategory.name.help_text"
+msgstr " "
+
+msgid "ItemMainCategory.verbose_name"
+msgstr "Kategorie"
+
+msgid "ItemMainCategory.verbose_name_plural"
+msgstr "Kategorien"
+
+msgid "ItemModel.category.verbose_name"
+msgstr "Kategorie"
+
+msgid "ItemModel.category.help_text"
+msgstr " "
+
 msgid "ItemModel.kind.verbose_name"
 msgstr "Art"
 

{pyinventory-0.21.4 → pyinventory-0.22.1}/inventory/locale/en/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-30 20:48+0200\n"
-"PO-Revision-Date: 2021-10-09 19:36+0200\n"
+"POT-Creation-Date: 2025-10-16 10:51+0200\n"
+"PO-Revision-Date: 2025-09-21 17:36+0200\n"
 "Last-Translator: Jens Diemer\n"
 "Language-Team: \n"
 "Language: en\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.4.2\n"
 
 msgid "Limit tree depth"
 msgstr ""
@@ -101,6 +101,24 @@ msgstr "Name"
 msgid "BaseItemAttachmentModel.name.help_text"
 msgstr ""
 
+msgid "ItemMainCategory.name.verbose_name"
+msgstr "Name"
+
+msgid "ItemMainCategory.name.help_text"
+msgstr " "
+
+msgid "ItemMainCategory.verbose_name"
+msgstr "Category"
+
+msgid "ItemMainCategory.verbose_name_plural"
+msgstr "Categories"
+
+msgid "ItemModel.category.verbose_name"
+msgstr "Category"
+
+msgid "ItemModel.category.help_text"
+msgstr " "
+
 msgid "ItemModel.kind.verbose_name"
 msgstr "Kind"
 

{pyinventory-0.21.4 → pyinventory-0.22.1}/inventory/locale/es/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-09-30 20:48+0200\n"
+"POT-Creation-Date: 2025-10-16 10:51+0200\n"
 "PO-Revision-Date: 2021-10-09 19:36+0200\n"
 "Last-Translator: Jaume López\n"
 "Language-Team: \n"
@@ -102,6 +102,24 @@ msgstr "Nombre"
 msgid "BaseItemAttachmentModel.name.help_text"
 msgstr ""
 
+msgid "ItemMainCategory.name.verbose_name"
+msgstr ""
+
+msgid "ItemMainCategory.name.help_text"
+msgstr " "
+
+msgid "ItemMainCategory.verbose_name"
+msgstr ""
+
+msgid "ItemMainCategory.verbose_name_plural"
+msgstr ""
+
+msgid "ItemModel.category.verbose_name"
+msgstr ""
+
+msgid "ItemModel.category.help_text"
+msgstr " "
+
 msgid "ItemModel.kind.verbose_name"
 msgstr "Tipos"
 

{pyinventory-0.21.4 → pyinventory-0.22.1}/inventory/management/commands/seed_data.py

@@ -7,6 +7,7 @@ from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand
 
 from inventory.models import ItemModel, LocationModel
+from inventory.models.item import ItemMainCategory
 
 
 SEED_DATA_USER_PREFIX = 'seed-data-user-'
@@ -46,7 +47,8 @@ def iter_location_chain(user, location_count):
 
 
 class ItemCreator:
-    def __init__(self):
+    def __init__(self, categories: list[ItemMainCategory]):
+        self.categories = itertools.cycle(categories)
         self.equipment_no = itertools.count(start=1)
         self.item_no = itertools.count(start=1)
         self.part_no = itertools.count(start=1)
@@ -57,10 +59,13 @@ class ItemCreator:
         assert user
         assert location
         while True:
+            category = next(self.categories)
+
             equipment = ItemModel.objects.create(
                 user=user,
+                category=category,
                 location=location,
-                name=f'Equipment {next(self.equipment_no):03}',
+                name=f'{category.name} {next(self.equipment_no):03}',
             )
             equipment.full_clean()
             yield equipment
@@ -68,6 +73,7 @@ class ItemCreator:
             while True:
                 item = ItemModel.objects.create(
                     user=user,
+                    category=category,
                     location=location,
                     name=f'Item {next(self.item_no):03}',
                     parent=equipment,
@@ -78,6 +84,7 @@ class ItemCreator:
                 while True:
                     part = ItemModel.objects.create(
                         user=user,
+                        category=category,
                         location=location,
                         name=f'Part {next(self.part_no):03}',
                         parent=item,
@@ -89,6 +96,14 @@ class ItemCreator:
                         return
 
 
+def create_categories() -> list[ItemMainCategory]:
+    categories = []
+    for category in ('Retrocomputing', 'Photo Equipment', 'Household Goods'):
+        instance = ItemMainCategory.objects.get_or_create(name=category)[0]
+        categories.append(instance)
+    return categories
+
+
 class Command(BaseCommand):
     help = 'Fill database with example data'
 
@@ -111,13 +126,15 @@ class Command(BaseCommand):
             log_level = logging.WARNING
 
         with SetupLogger(level=log_level):
+            categories = create_categories()
+
             existing_users = User.objects.filter(username__startswith=SEED_DATA_USER_PREFIX)
             for user in existing_users:
                 self.stdout.write(f'Clean data from user {user}...')
                 info = user.delete()
                 self.stdout.write(f'done: {info}')
 
-            item_creator = ItemCreator()
+            item_creator = ItemCreator(categories)
 
             for user_no in range(1, user_count + 1):
                 self.stdout.write('_' * 100)

pyinventory-0.22.1/inventory/migrations/0015_itemmaincategory_itemmodel_category.py

@@ -0,0 +1,32 @@
+# Generated by Django 5.1.12 on 2025-10-16 08:44
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0014_alter_itemmodel_description_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ItemMainCategory',
+            fields=[
+                ('id', models.SmallAutoField(primary_key=True, serialize=False)),
+                ('name', models.CharField(help_text='ItemMainCategory.name.help_text', max_length=32, unique=True, verbose_name='ItemMainCategory.name.verbose_name')),
+                ('order', models.SmallIntegerField(default=0)),
+            ],
+            options={
+                'verbose_name': 'ItemMainCategory.verbose_name',
+                'verbose_name_plural': 'ItemMainCategory.verbose_name_plural',
+                'ordering': ('order', 'name'),
+            },
+        ),
+        migrations.AddField(
+            model_name='itemmodel',
+            name='category',
+            field=models.ForeignKey(blank=True, help_text='ItemModel.category.help_text', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='items', to='inventory.itemmaincategory', verbose_name='ItemModel.category.verbose_name'),
+        ),
+    ]

{pyinventory-0.21.4 → pyinventory-0.22.1}/inventory/models/item.py

@@ -17,6 +17,29 @@ from inventory.models.links import BaseLink
 logger = logging.getLogger(__name__)
 
 
+class ItemMainCategory(models.Model):
+    id = models.SmallAutoField(primary_key=True)
+    name = models.CharField(
+        max_length=32,
+        unique=True,
+        verbose_name=_('ItemMainCategory.name.verbose_name'),
+        help_text=_('ItemMainCategory.name.help_text'),
+    )
+    order = models.SmallIntegerField(
+        default=0,
+        blank=False,
+        null=False,
+    )
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        ordering = ('order', 'name')
+        verbose_name = _('ItemMainCategory.verbose_name')
+        verbose_name_plural = _('ItemMainCategory.verbose_name_plural')
+
+
 class ItemQuerySet(models.QuerySet):
     def sort(self):
         return self.order_by('kind', 'producer', 'name')
@@ -29,6 +52,16 @@ class ItemModel(BaseParentTreeModel, VersionProtectBaseModel):
 
     objects = ItemQuerySet.as_manager()
 
+    category = models.ForeignKey(
+        ItemMainCategory,
+        null=True,
+        blank=True,
+        on_delete=models.PROTECT,
+        related_name='items',
+        verbose_name=_('ItemModel.category.verbose_name'),
+        help_text=_('ItemModel.category.help_text'),
+    )
+
     kind = tagulous.models.TagField(
         case_sensitive=False,
         force_lowercase=False,

pyinventory-0.22.1/inventory/persistent_filters.py

@@ -0,0 +1,72 @@
+import logging
+
+from django.contrib import admin
+from django.core.cache import cache
+from django.db.models.options import Options
+
+
+logger = logging.getLogger(__name__)
+
+
+CURRENT_CATEGORY_CACHE_KEY_PREFIX = 'persistent_parameter'
+CURRENT_CATEGORY_CACHE_TIMEOUT = 60 * 60 * 24 * 14  # 2 weeks
+
+
+def persistent_parameter(request, opts: Options, parameter_name: str):
+    cache_key = (
+        f'{CURRENT_CATEGORY_CACHE_KEY_PREFIX}_{request.user.pk}_{opts.app_label}_{opts.model_name}_{parameter_name}'
+    )
+
+    # Collect from GET:
+    if parameter_name in request.GET:
+        current_value = request.GET[parameter_name] or None
+        logger.debug('Store %r to %r', current_value, cache_key)
+        cache.set(cache_key, current_value, timeout=CURRENT_CATEGORY_CACHE_TIMEOUT)
+        return current_value
+
+    # Try to restore from cache:
+    current_value = cache.get(cache_key)
+    logger.debug('Restore %r from %r', current_value, cache_key)
+    return current_value
+
+
+class PersistentRelatedFieldListFilter(admin.RelatedFieldListFilter):
+    """
+    Stores the last filter value in the cache and restores it on next visit.
+    Note: Will not restore "is null" filter state!
+    """
+
+    def __init__(self, field, request, params, model, model_admin, field_path):
+        opts: Options = model._meta
+
+        # Our own parameter to display all choices:
+        self.lookup_kwarg_display_all = '%s__all' % field_path
+        display_all = bool(params.pop(self.lookup_kwarg_display_all, None))
+
+        super().__init__(field, request, params, model, model_admin, field_path)
+
+        if display_all:
+            logger.info('Display all choice for %s, ignore persistent filter for %r', opts.model_name, field_path)
+        else:
+            current_parameter = persistent_parameter(request, opts, parameter_name=self.lookup_kwarg)
+            if current_parameter and not self.lookup_val and not self.lookup_val_isnull:
+                logger.info('Restore %r filter for %s with %r', field_path, opts.model_name, current_parameter)
+                self.lookup_val = [current_parameter]
+                self.used_parameters = {self.lookup_kwarg: self.lookup_val}
+
+    @property
+    def include_empty_choice(self):
+        return True
+
+    def choices(self, changelist):
+        choices = iter(super().choices(changelist))
+
+        # Change the "All" choice to our own "display all" choice:
+        all_choice = next(choices)
+        all_choice['query_string'] = changelist.get_query_string(
+            new_params={self.lookup_kwarg_display_all: True},
+            remove=[self.lookup_kwarg, self.lookup_kwarg_isnull],
+        )
+        yield all_choice
+
+        yield from choices