PyInventory 0.22.1__tar.gz → 0.23.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyInventory
-Version: 0.22.1
+Version: 0.23.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
@@ -196,6 +196,12 @@ To make a new release, do this:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.23.0](https://github.com/jedie/PyInventory/compare/v0.22.1...v0.23.0)
+  * 2025-11-25 - Enhance 'Change category for selected items' and add tests for it
+  * 2025-11-25 - Update requirements
+  * 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
 * [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
@@ -205,6 +211,9 @@ To make a new release, do this:
   * 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
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.21.3](https://github.com/jedie/PyInventory/compare/v0.21.2...v0.21.3)
   * 2025-09-21 - Enhance change list filters by using RelatedOnlyFieldListFilter
   * 2025-09-21 - Update requirements
@@ -217,9 +226,6 @@ 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

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

@@ -166,6 +166,12 @@ To make a new release, do this:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.23.0](https://github.com/jedie/PyInventory/compare/v0.22.1...v0.23.0)
+  * 2025-11-25 - Enhance 'Change category for selected items' and add tests for it
+  * 2025-11-25 - Update requirements
+  * 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
 * [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
@@ -175,6 +181,9 @@ To make a new release, do this:
   * 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
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.21.3](https://github.com/jedie/PyInventory/compare/v0.21.2...v0.21.3)
   * 2025-09-21 - Enhance change list filters by using RelatedOnlyFieldListFilter
   * 2025-09-21 - Update requirements
@@ -187,9 +196,6 @@ 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

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

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

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

@@ -2,8 +2,11 @@ import logging
 
 import tagulous
 from adminsortable2.admin import SortableAdminBase, SortableAdminMixin, SortableInlineAdminMixin
+from django import forms
 from django.conf import settings
-from django.contrib import admin
+from django.contrib import admin, messages
+from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
+from django.shortcuts import render
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.html import format_html
@@ -18,7 +21,6 @@ from inventory.admin.base import (
     LimitTreeDepthListFilter,
     UserInlineMixin,
 )
-from inventory.admin.tagulous_fix import TagulousModelAdminFix
 from inventory.models import ItemLinkModel, ItemModel
 from inventory.models.item import ItemFileModel, ItemImageModel, ItemMainCategory
 from inventory.persistent_filters import PersistentRelatedFieldListFilter
@@ -51,8 +53,53 @@ class ItemModelResource(ModelResource):
         model = ItemModel
 
 
+class ChangeCategoryForm(forms.Form):
+    category = forms.ModelChoiceField(
+        queryset=ItemMainCategory.objects.all(),
+        label=_('New category'),
+        required=True,
+    )
+
+
+@admin.action(description=_('Change category for selected items'))
+def mass_change_category_action(modeladmin, request, queryset):
+    item_count = queryset.count()
+    assert item_count > 0, 'No items selected for mass category change.'
+    if 'category' in request.POST:
+        form = ChangeCategoryForm(request.POST)
+        if form.is_valid():
+            category = form.cleaned_data['category']
+            updated = queryset.update(category=category)
+            messages.info(
+                request,
+                _('%(count)d items have been assigned to the category "%(category)s".')
+                % {'count': updated, 'category': str(category)},
+            )
+            return None
+    else:
+        form = ChangeCategoryForm()
+
+    # Collect currently used categories from selected items:
+    used_categories = queryset.order_by('category__name').values_list('category__name', flat=True).distinct()
+
+    return render(
+        request,
+        'admin/item/mass_change_category_action.html',
+        context={
+            'title': _('Change category for selected items'),
+            'opts': modeladmin.model._meta,
+            'item_count': item_count,
+            'items': queryset,
+            'used_categories': used_categories,
+            'form': form,
+            'action_checkbox_name': ACTION_CHECKBOX_NAME,
+            **modeladmin.admin_site.each_context(request),
+        },
+    )
+
+
 @admin.register(ItemModel)
-class ItemModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminBase, BaseUserAdmin):
+class ItemModelAdmin(ImportExportMixin, SortableAdminBase, BaseUserAdmin):
     @admin.display(description=_('Related items'))
     def related_items(self, obj):
         if obj.pk is None:
@@ -167,6 +214,7 @@ class ItemModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminBase
     autocomplete_fields = ('parent', 'location')
     readonly_fields = ('id', 'create_dt', 'update_dt', 'user', 'related_items')
     inlines = (ItemImageModelInline, ItemFileModelInline, ItemLinkModelInline)
+    actions = (mass_change_category_action,)
 
 
 tagulous.admin.enhance(ItemModel, ItemModelAdmin)

{pyinventory-0.22.1 → pyinventory-0.23.0}/inventory/admin/memo.py

@@ -8,7 +8,6 @@ from import_export.admin import ImportExportMixin
 from import_export.resources import ModelResource
 
 from inventory.admin.base import BaseFileModelInline, BaseImageModelInline, BaseUserAdmin, UserInlineMixin
-from inventory.admin.tagulous_fix import TagulousModelAdminFix
 from inventory.models import MemoLinkModel, MemoModel
 from inventory.models.memo import MemoFileModel, MemoImageModel
 
@@ -35,7 +34,7 @@ class MemoModelResource(ModelResource):
 
 
 @admin.register(MemoModel)
-class MemoModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminBase, BaseUserAdmin):
+class MemoModelAdmin(ImportExportMixin, SortableAdminBase, BaseUserAdmin):
     def get_max_order(self, request, obj=None):
         # Work-a-round for: https://github.com/jrief/django-admin-sortable2/issues/341
         return 0

pyinventory-0.23.0/inventory/admin/tests/test_item.py

@@ -0,0 +1,134 @@
+from unittest import mock
+from uuid import UUID
+
+from bx_django_utils.test_utils.html_assertion import HtmlAssertionMixin, assert_html_response_snapshot
+from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME
+from django.template.defaulttags import CsrfTokenNode, NowNode
+from django.test import TestCase, override_settings
+from django.urls import reverse
+from model_bakery import baker
+
+from inventory.admin.item import mass_change_category_action
+from inventory.models import ItemMainCategory, ItemModel
+from inventory_project.tests.fixtures import get_normal_user
+from inventory_project.tests.mocks import MockInventoryVersionString
+
+
+@override_settings(SECURE_SSL_REDIRECT=False)
+class MassChangeCategoryActionAdminTest(HtmlAssertionMixin, TestCase):
+    maxDiff = None
+
+    def test_happy_path(self):
+        normaluser = get_normal_user()
+        self.client.force_login(normaluser)
+
+        category1 = baker.make(ItemMainCategory, order=0, id=1, name='Category 1')
+        category2 = baker.make(ItemMainCategory, order=1, id=2, name='Category 2')
+        baker.make(
+            ItemModel,
+            name='A',
+            user=normaluser,
+            id=UUID('80dddef9-0000-0000-0000-000000000001'),
+            category=category1,
+        ).full_clean()
+        baker.make(
+            ItemModel,
+            name='B',
+            user=normaluser,
+            id=UUID('80dddef9-0000-0000-0000-000000000002'),
+            category=category1,
+        ).full_clean()
+        baker.make(
+            ItemModel,
+            name='C',
+            user=normaluser,
+            id=UUID('80dddef9-0000-0000-0000-000000000003'),
+            category=category2,
+        ).full_clean()
+        baker.make(
+            ItemModel,
+            name='D',
+            user=normaluser,
+            id=UUID('80dddef9-0000-0000-0000-000000000004'),
+            category=category2,
+        ).full_clean()
+
+        url = reverse('admin:inventory_itemmodel_changelist')
+        self.assertEqual(url, '/admin/inventory/itemmodel/')
+
+        ########################################################################################
+        # Snapshot the Form:
+        with (
+            mock.patch.object(NowNode, 'render', return_value='MockedNowNode'),
+            mock.patch.object(CsrfTokenNode, 'render', return_value='MockedCsrfTokenNode'),
+            MockInventoryVersionString(),
+        ):
+            response = self.client.post(
+                '/admin/inventory/itemmodel/',
+                data={
+                    ACTION_CHECKBOX_NAME: [
+                        '80dddef9-0000-0000-0000-000000000002',
+                        '80dddef9-0000-0000-0000-000000000003',
+                    ],
+                    'action': mass_change_category_action.__name__,
+                },
+            )
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, 'admin/item/mass_change_category_action.html')
+        self.assert_html_parts(
+            response,
+            parts=(
+                '<title>Change category for selected items | PyInventory vMockedVersionString</title>',
+                '<p>Number of selected items: 2</p>',
+                '<label for="id_category">New category:</label>',
+                '<input type="hidden" name="action" value="mass_change_category_action">',
+            ),
+        )
+        assert_html_response_snapshot(response, query_selector='#content', validate=False)
+
+        ########################################################################################
+        # Perform the action
+
+        def get_info():
+            return list(ItemModel.objects.order_by('pk').values_list('pk', 'category__name'))
+
+        before = get_info()
+
+        response = self.client.post(
+            '/admin/inventory/itemmodel/',
+            data={
+                ACTION_CHECKBOX_NAME: [
+                    '80dddef9-0000-0000-0000-000000000002',
+                    '80dddef9-0000-0000-0000-000000000003',
+                ],
+                'action': mass_change_category_action.__name__,
+                'category': category2.pk,
+            },
+        )
+        self.assertRedirects(response, '/admin/inventory/itemmodel/', fetch_redirect_response=False)
+        self.assert_messages(
+            response,
+            expected_messages=[
+                '2 items have been assigned to the category "Category 2".',
+            ],
+        )
+
+        after = get_info()
+        self.assertEqual(
+            before,
+            [
+                (UUID('80dddef9-0000-0000-0000-000000000001'), 'Category 1'),
+                (UUID('80dddef9-0000-0000-0000-000000000002'), 'Category 1'),
+                (UUID('80dddef9-0000-0000-0000-000000000003'), 'Category 2'),
+                (UUID('80dddef9-0000-0000-0000-000000000004'), 'Category 2'),
+            ],
+        )
+        self.assertEqual(
+            after,
+            [
+                (UUID('80dddef9-0000-0000-0000-000000000001'), 'Category 1'),  # Not selected
+                (UUID('80dddef9-0000-0000-0000-000000000002'), 'Category 2'),  # Changed
+                (UUID('80dddef9-0000-0000-0000-000000000003'), 'Category 2'),  # Already there
+                (UUID('80dddef9-0000-0000-0000-000000000004'), 'Category 2'),  # Not selected
+            ],
+        )

pyinventory-0.23.0/inventory/admin/tests/test_item_happy_path_1.snapshot.html

@@ -0,0 +1,48 @@
+<div class="colM" id="content">
+ <h1>
+  Change category for selected items
+ </h1>
+ <p>
+  Number of selected items: 2
+ </p>
+ <p>
+  Currently used categories are:
+ </p>
+ <ul>
+  <li>
+   Category 1
+  </li>
+  <li>
+   Category 2
+  </li>
+ </ul>
+ <form method="post">
+  MockedCsrfTokenNode
+  <div>
+   <p>
+    <label for="id_category">
+     New category:
+    </label>
+    <select id="id_category" name="category" required="">
+     <option selected="" value="">
+      ---------
+     </option>
+     <option value="1">
+      Category 1
+     </option>
+     <option value="2">
+      Category 2
+     </option>
+    </select>
+   </p>
+   <input name="action" type="hidden" value="mass_change_category_action"/>
+   <input name="_selected_action" type="hidden" value="80dddef9-0000-0000-0000-000000000002"/>
+   <input name="_selected_action" type="hidden" value="80dddef9-0000-0000-0000-000000000003"/>
+   <input type="submit" value="Yes, I’m sure"/>
+   <a class="button cancel-link" href="/admin/inventory/itemmodel/">
+    No, take me back
+   </a>
+  </div>
+ </form>
+ <br class="clear"/>
+</div>

{pyinventory-0.22.1 → pyinventory-0.23.0}/inventory/models/__init__.py

@@ -1,3 +1,3 @@
-from inventory.models.item import ItemFileModel, ItemImageModel, ItemLinkModel, ItemModel  # noqa
+from inventory.models.item import ItemFileModel, ItemImageModel, ItemLinkModel, ItemModel, ItemMainCategory  # noqa
 from inventory.models.location import LocationModel  # noqa
 from inventory.models.memo import MemoFileModel, MemoImageModel, MemoLinkModel, MemoModel  # noqa

pyinventory-0.23.0/inventory/templates/admin/item/mass_change_category_action.html

@@ -0,0 +1,32 @@
+{% extends "admin/base_site.html" %}
+{% load i18n l10n admin_urls %}
+
+{% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation delete-selected-confirmation{% endblock %}
+
+{% block breadcrumbs %}
+<div class="breadcrumbs">
+<a href="{% url 'admin:index' %}">{% translate 'Home' %}</a>
+&rsaquo; <a href="{% url 'admin:app_list' app_label=opts.app_label %}">{{ opts.app_config.verbose_name }}</a>
+&rsaquo; <a href="{% url opts|admin_urlname:'changelist' %}">{{ opts.verbose_name_plural|capfirst }}</a>
+&rsaquo; {% translate 'Change category for selected items' %}
+</div>
+{% endblock %}
+
+{% block content %}
+<p>{% trans "Number of selected items:" %} {{ item_count }}</p>
+<p>{% trans "Currently used categories are:" %}</p>
+<ul>
+{% for category_name in used_categories %}
+    <li>{{ category_name }}</li>
+{% endfor %}
+</ul>
+<form method="post">{% csrf_token %}
+    <div>
+    {{ form.as_p }}
+    <input type="hidden" name="action" value="mass_change_category_action">
+    {% for obj in items %}<input type="hidden" name="{{ action_checkbox_name }}" value="{{ obj.pk }}">{% endfor %}
+    <input type="submit" value="{% translate 'Yes, I’m sure' %}">
+    <a href="{% url opts|admin_urlname:'changelist' %}" class="button cancel-link">{% translate "No, take me back" %}</a>
+    </div>
+</form>
+{% endblock %}

{pyinventory-0.22.1 → pyinventory-0.23.0}/inventory_project/tests/test_admin_item_auto_group_items_1.snapshot.html

@@ -59,6 +59,9 @@
         <option value="delete_selected">
          Delete selected Items
         </option>
+        <option value="mass_change_category_action">
+         Change category for selected items
+        </option>
        </select>
       </label>
       <input class="select-across" name="select_across" type="hidden" value="0"/>

{pyinventory-0.22.1 → pyinventory-0.23.0}/inventory_project/tests/test_admin_item_normal_user_create_minimal_item_2.snapshot.html

@@ -23,8 +23,6 @@
    <link href="/static/admin/css/autocomplete.css" media="screen" rel="stylesheet"/>
    <script src="/static/admin/js/vendor/jquery/jquery.min.js">
    </script>
-   <script src="/static/adminsortable2/js/adminsortable2.min.js">
-   </script>
    <script src="/static/tagulous/tagulous.js">
    </script>
    <script src="/static/tinymce/tinymce.min.js">
@@ -51,7 +49,7 @@
    </script>
    <script src="/static/admin/js/admin/RelatedObjectLookups.js">
    </script>
-   <script src="/static/admin/js/actions.js">
+   <script src="/static/adminsortable2/js/actions-5.1.js">
    </script>
    <script src="/static/admin/js/urlify.js">
    </script>
@@ -59,6 +57,8 @@
    </script>
    <script src="/static/admin/js/vendor/xregexp/xregexp.min.js">
    </script>
+   <script src="/static/adminsortable2/js/adminsortable2.min.js">
+   </script>
    <meta content="width=device-width, initial-scale=1.0" name="viewport"/>
    <link href="/static/admin/css/responsive.css" rel="stylesheet"/>
    <meta content="NONE,NOARCHIVE" name="robots"/>

{pyinventory-0.22.1 → pyinventory-0.23.0}/pyproject.toml

@@ -100,9 +100,7 @@ version_module_name = "inventory" # Used by "update-readme-history" pre-commit h
 requirements=["requirements.dev.txt"]
 strict=true
 require_hashes=true
-ignore-vuln=[
-    "GHSA-4xh5-x5gv-qwph",  # https://github.com/advisories/GHSA-4xh5-x5gv-qwph
-]
+ignore-vuln=[]
 
 
 [tool.ruff]