PyInventory 0.19.3__tar.gz → 0.20.1__tar.gz

{PyInventory-0.19.3 → pyinventory-0.20.1}/.editorconfig

@@ -9,6 +9,9 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[*.{html,css,js}]
+insert_final_newline = false
+
 [*.py]
 max_line_length = 119
 
@@ -16,5 +19,5 @@ max_line_length = 119
 indent_style = tab
 insert_final_newline = false
 
-[*.yml]
+[{*.yaml,*.yml}]
 indent_size = 2

{PyInventory-0.19.3 → pyinventory-0.20.1}/.flake8

@@ -2,6 +2,6 @@
 # Move to pyproject.toml after: https://github.com/PyCQA/flake8/issues/234
 #
 [flake8]
-exclude = .*, dist, htmlcov, */migrations/*, volumes
+exclude = .*, dist, htmlcov, */migrations/*
 #ignore = E402
 max-line-length = 119

{PyInventory-0.19.3 → pyinventory-0.20.1}/.github/workflows/tests.yml

@@ -17,10 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.11", "3.10", "3.9"]
-    env:
-      PYTHONUNBUFFERED: 1
-      PYTHONWARNINGS: always
+        python-version: ['3.12', '3.11']
     steps:
     - name: Checkout
       run: |
@@ -30,7 +27,7 @@ jobs:
         git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
 
     - name: 'Set up Python ${{ matrix.python-version }}'
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       # https://github.com/marketplace/actions/setup-python
       with:
         python-version: '${{ matrix.python-version }}'
@@ -50,17 +47,19 @@ jobs:
       run: |
         ./manage.py --help
 
-    # FIXME:
-    #- name: 'Safety'
-    #  run: |
-    #    ./manage.py safety
+    - name: 'pip-audit'
+      run: |
+        ./manage.py pip_audit
 
     - name: 'Python ${{ matrix.python-version }}'
+      env:
+        PYTHONUNBUFFERED: 1
+        PYTHONWARNINGS: always
       run: |
         ./manage.py tox -e $(echo py${{ matrix.python-version }} | tr -d .)
 
     - name: 'Upload coverage report'
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       # https://github.com/marketplace/actions/codecov
       with:
         fail_ci_if_error: false

{PyInventory-0.19.3 → pyinventory-0.20.1}/.gitignore

@@ -9,6 +9,8 @@ __pycache__
 !.editorconfig
 !.flake8
 !.gitignore
+!.pre-commit-config.yaml
+!.pre-commit-hooks.yaml
 !.gitkeep
 
 # for django-dbbackup

pyinventory-0.20.1/.pre-commit-config.yaml

@@ -0,0 +1,12 @@
+# pre-commit plugin configuration
+# See https://pre-commit.com for more information
+default_install_hook_types:
+  - pre-commit
+  - post-rewrite
+  - pre-push
+
+repos:
+  - repo: https://github.com/jedie/cli-base-utilities
+    rev: v0.11.0
+    hooks:
+      - id: update-readme-history

pyinventory-0.20.1/.pre-commit-hooks.yaml

@@ -0,0 +1,13 @@
+# https://pre-commit.com/#creating-new-hooks
+- id: update-readme-history
+  name: cli-base-utilities
+  description: >-
+    Update history in README.md from git log.
+  entry: "python -m cli_base update-readme-history -v"
+  language: python
+  language_version: python3
+  require_serial: true
+  pass_filenames: false
+  always_run: true
+  verbose: true
+  stages: [pre-commit, post-rewrite, pre-push]

{PyInventory-0.19.3 → pyinventory-0.20.1}/PKG-INFO

@@ -1,24 +1,24 @@
 Metadata-Version: 2.1
 Name: PyInventory
-Version: 0.19.3
+Version: 0.20.1
 Summary: Web based management to catalog things including state and location etc. using Python/Django.
 Author-email: Jens Diemer <PyInventory@jensdiemer.de>
 License: GPL-3.0-or-later
 Project-URL: Documentation, https://github.com/jedie/PyInventory
 Project-URL: Source, https://github.com/jedie/PyInventory
 Keywords: inventory,django
-Requires-Python: <4,>=3.9
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS
+Requires-Dist: django
 Requires-Dist: colorlog
 Requires-Dist: gunicorn
-Requires-Dist: django
 Requires-Dist: django-import-export
 Requires-Dist: django-dbbackup
 Requires-Dist: django-tools
 Requires-Dist: django-reversion-compare
-Requires-Dist: django-ckeditor
+Requires-Dist: django-tinymce
 Requires-Dist: django-tagulous
 Requires-Dist: django-admin-sortable2
 Requires-Dist: pillow
@@ -27,10 +27,12 @@ Requires-Dist: django-debug-toolbar
 Requires-Dist: bx_py_utils
 Requires-Dist: bx_django_utils
 Provides-Extra: dev
-Requires-Dist: manage_django_project>=0.6.4; extra == "dev"
+Requires-Dist: django-debug-toolbar; extra == "dev"
+Requires-Dist: manage_django_project; extra == "dev"
 Requires-Dist: cmd2_ext_test; extra == "dev"
 Requires-Dist: playwright; extra == "dev"
 Requires-Dist: beautifulsoup4; extra == "dev"
+Requires-Dist: lxml; extra == "dev"
 Requires-Dist: tblib; extra == "dev"
 Requires-Dist: pip-tools; extra == "dev"
 Requires-Dist: tox; extra == "dev"
@@ -38,18 +40,20 @@ Requires-Dist: coverage; extra == "dev"
 Requires-Dist: autopep8; extra == "dev"
 Requires-Dist: pyupgrade; extra == "dev"
 Requires-Dist: flake8; extra == "dev"
+Requires-Dist: flake8-bugbear; extra == "dev"
 Requires-Dist: pyflakes; extra == "dev"
 Requires-Dist: codespell; extra == "dev"
 Requires-Dist: EditorConfig; extra == "dev"
-Requires-Dist: safety; extra == "dev"
+Requires-Dist: pip-audit; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: twine; extra == "dev"
+Requires-Dist: typeguard; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: darker[color,flynt,isort]; extra == "dev"
-Requires-Dist: tomli; extra == "dev"
-Requires-Dist: typing-extensions>=3.10; extra == "dev"
 Requires-Dist: model_bakery; extra == "dev"
 Requires-Dist: requests-mock; extra == "dev"
 Requires-Dist: django-override-storage; extra == "dev"
+Requires-Dist: backports.tarfile; extra == "dev"
 
 # PyInventory
 
@@ -196,6 +200,11 @@ please use YunoHost ;)
 * Remove `poetry`, `pytest` and `devshell`
 * Use `pip-tools`, `unittests` and [manage_django_project](https://github.com/jedie/manage_django_project)
 
+### v0.20
+
+Because of security reasons, the `ckeditor` package was replaced by `prose-editor`.
+
+In 0.20.1 we switched to https://github.com/jazzband/django-tinymce/ because `prose-editor` has no table support.
 
 ## Make new release
 
@@ -214,6 +223,13 @@ To make a new release, do this:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.20.1](https://github.com/jedie/PyInventory/compare/v0.20.0...v0.20.1)
+  * 2024-09-05 - switched to https://github.com/jazzband/django-tinymce/
+* [v0.20.0](https://github.com/jedie/PyInventory/compare/v0.19.3...v0.20.0)
+  * 2024-09-05 - Replace django-ckeditor with django-prose-editor and fix tests
+  * 2024-09-05 - Project updates
+  * 2024-01-16 - Use typeguard in tests
+  * 2024-01-16 - Update requirements
 * [v0.19.3](https://github.com/jedie/PyInventory/compare/v0.19.2...v0.19.3)
   * 2023-11-01 - Auto generate README history
   * 2023-11-01 - Update requirements
@@ -225,6 +241,9 @@ To make a new release, do this:
 * [v0.19.2](https://github.com/jedie/PyInventory/compare/v0.19.1...v0.19.2)
   * 2023-08-17 - Bugfix packaging by adding "requests" as normal dependencies
   * 2023-08-17 - Bugfix packageing by adding "requests" as normal dependencies
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.19.1](https://github.com/jedie/PyInventory/compare/v0.19.0...v0.19.1)
   * 2023-08-17 - Update requirements
   * 2023-08-17 - Update from project template
@@ -237,9 +256,6 @@ To make a new release, do this:
   * 2023-07-21 - Update to Django 4.2
   * 2023-07-21 - FIXME: Remove '_reorder_' from ItemModelAdmin.list_display
   * 2023-07-20 - Change item lust: move "producer" to first
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.18.1](https://github.com/jedie/PyInventory/compare/v0.18.0...v0.18.1)
   * 2023-07-15 - Update requirements + fix test snapshot
   * 2023-06-11 - Update requirements

{PyInventory-0.19.3 → pyinventory-0.20.1}/PyInventory.egg-info/PKG-INFO

@@ -1,24 +1,24 @@
 Metadata-Version: 2.1
 Name: PyInventory
-Version: 0.19.3
+Version: 0.20.1
 Summary: Web based management to catalog things including state and location etc. using Python/Django.
 Author-email: Jens Diemer <PyInventory@jensdiemer.de>
 License: GPL-3.0-or-later
 Project-URL: Documentation, https://github.com/jedie/PyInventory
 Project-URL: Source, https://github.com/jedie/PyInventory
 Keywords: inventory,django
-Requires-Python: <4,>=3.9
+Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
 License-File: AUTHORS
+Requires-Dist: django
 Requires-Dist: colorlog
 Requires-Dist: gunicorn
-Requires-Dist: django
 Requires-Dist: django-import-export
 Requires-Dist: django-dbbackup
 Requires-Dist: django-tools
 Requires-Dist: django-reversion-compare
-Requires-Dist: django-ckeditor
+Requires-Dist: django-tinymce
 Requires-Dist: django-tagulous
 Requires-Dist: django-admin-sortable2
 Requires-Dist: pillow
@@ -27,10 +27,12 @@ Requires-Dist: django-debug-toolbar
 Requires-Dist: bx_py_utils
 Requires-Dist: bx_django_utils
 Provides-Extra: dev
-Requires-Dist: manage_django_project>=0.6.4; extra == "dev"
+Requires-Dist: django-debug-toolbar; extra == "dev"
+Requires-Dist: manage_django_project; extra == "dev"
 Requires-Dist: cmd2_ext_test; extra == "dev"
 Requires-Dist: playwright; extra == "dev"
 Requires-Dist: beautifulsoup4; extra == "dev"
+Requires-Dist: lxml; extra == "dev"
 Requires-Dist: tblib; extra == "dev"
 Requires-Dist: pip-tools; extra == "dev"
 Requires-Dist: tox; extra == "dev"
@@ -38,18 +40,20 @@ Requires-Dist: coverage; extra == "dev"
 Requires-Dist: autopep8; extra == "dev"
 Requires-Dist: pyupgrade; extra == "dev"
 Requires-Dist: flake8; extra == "dev"
+Requires-Dist: flake8-bugbear; extra == "dev"
 Requires-Dist: pyflakes; extra == "dev"
 Requires-Dist: codespell; extra == "dev"
 Requires-Dist: EditorConfig; extra == "dev"
-Requires-Dist: safety; extra == "dev"
+Requires-Dist: pip-audit; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: twine; extra == "dev"
+Requires-Dist: typeguard; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: darker[color,flynt,isort]; extra == "dev"
-Requires-Dist: tomli; extra == "dev"
-Requires-Dist: typing-extensions>=3.10; extra == "dev"
 Requires-Dist: model_bakery; extra == "dev"
 Requires-Dist: requests-mock; extra == "dev"
 Requires-Dist: django-override-storage; extra == "dev"
+Requires-Dist: backports.tarfile; extra == "dev"
 
 # PyInventory
 
@@ -196,6 +200,11 @@ please use YunoHost ;)
 * Remove `poetry`, `pytest` and `devshell`
 * Use `pip-tools`, `unittests` and [manage_django_project](https://github.com/jedie/manage_django_project)
 
+### v0.20
+
+Because of security reasons, the `ckeditor` package was replaced by `prose-editor`.
+
+In 0.20.1 we switched to https://github.com/jazzband/django-tinymce/ because `prose-editor` has no table support.
 
 ## Make new release
 
@@ -214,6 +223,13 @@ To make a new release, do this:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.20.1](https://github.com/jedie/PyInventory/compare/v0.20.0...v0.20.1)
+  * 2024-09-05 - switched to https://github.com/jazzband/django-tinymce/
+* [v0.20.0](https://github.com/jedie/PyInventory/compare/v0.19.3...v0.20.0)
+  * 2024-09-05 - Replace django-ckeditor with django-prose-editor and fix tests
+  * 2024-09-05 - Project updates
+  * 2024-01-16 - Use typeguard in tests
+  * 2024-01-16 - Update requirements
 * [v0.19.3](https://github.com/jedie/PyInventory/compare/v0.19.2...v0.19.3)
   * 2023-11-01 - Auto generate README history
   * 2023-11-01 - Update requirements
@@ -225,6 +241,9 @@ To make a new release, do this:
 * [v0.19.2](https://github.com/jedie/PyInventory/compare/v0.19.1...v0.19.2)
   * 2023-08-17 - Bugfix packaging by adding "requests" as normal dependencies
   * 2023-08-17 - Bugfix packageing by adding "requests" as normal dependencies
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.19.1](https://github.com/jedie/PyInventory/compare/v0.19.0...v0.19.1)
   * 2023-08-17 - Update requirements
   * 2023-08-17 - Update from project template
@@ -237,9 +256,6 @@ To make a new release, do this:
   * 2023-07-21 - Update to Django 4.2
   * 2023-07-21 - FIXME: Remove '_reorder_' from ItemModelAdmin.list_display
   * 2023-07-20 - Change item lust: move "producer" to first
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.18.1](https://github.com/jedie/PyInventory/compare/v0.18.0...v0.18.1)
   * 2023-07-15 - Update requirements + fix test snapshot
   * 2023-06-11 - Update requirements

{PyInventory-0.19.3 → pyinventory-0.20.1}/PyInventory.egg-info/SOURCES.txt

@@ -1,6 +1,8 @@
 .editorconfig
 .flake8
 .gitignore
+.pre-commit-config.yaml
+.pre-commit-hooks.yaml
 .travis.yml
 AUTHORS
 LICENSE
@@ -19,6 +21,7 @@ PyInventory.egg-info/top_level.txt
 inventory/__init__.py
 inventory/apps.py
 inventory/ckeditor_upload.py
+inventory/constants.py
 inventory/context_processors.py
 inventory/forms.py
 inventory/middlewares.py
@@ -58,6 +61,7 @@ inventory/migrations/0010_version_protect_models.py
 inventory/migrations/0011_parent_tree1.py
 inventory/migrations/0012_parent_tree2.py
 inventory/migrations/0013_alter_itemmodel_location.py
+inventory/migrations/0014_alter_itemmodel_description_and_more.py
 inventory/migrations/__init__.py
 inventory/models/__init__.py
 inventory/models/base.py
@@ -103,8 +107,9 @@ inventory_project/tests/test_admin_item_normal_user_create_minimal_item_1.snapsh
 inventory_project/tests/test_admin_item_normal_user_create_minimal_item_2.snapshot.html
 inventory_project/tests/test_admin_memo.py
 inventory_project/tests/test_admin_memo_normal_user_create_minimal_item_1.snapshot.html
+inventory_project/tests/test_admin_superuser_admin_index_1.snapshot.html
 inventory_project/tests/test_inventory_commands.py
-inventory_project/tests/test_inventory_commands_help_django4.2.snapshot.txt
+inventory_project/tests/test_inventory_commands_help_1.snapshot.txt
 inventory_project/tests/test_migrations.py
 inventory_project/tests/test_models_item.py
 inventory_project/tests/test_playwright_admin.py

{PyInventory-0.19.3 → pyinventory-0.20.1}/PyInventory.egg-info/requires.txt

@@ -1,11 +1,11 @@
+django
 colorlog
 gunicorn
-django
 django-import-export
 django-dbbackup
 django-tools
 django-reversion-compare
-django-ckeditor
+django-tinymce
 django-tagulous
 django-admin-sortable2
 pillow
@@ -15,10 +15,12 @@ bx_py_utils
 bx_django_utils
 
 [dev]
-manage_django_project>=0.6.4
+django-debug-toolbar
+manage_django_project
 cmd2_ext_test
 playwright
 beautifulsoup4
+lxml
 tblib
 pip-tools
 tox
@@ -26,15 +28,17 @@ coverage
 autopep8
 pyupgrade
 flake8
+flake8-bugbear
 pyflakes
 codespell
 EditorConfig
-safety
+pip-audit
 mypy
 twine
+typeguard
+pre-commit
 darker[color,flynt,isort]
-tomli
-typing-extensions>=3.10
 model_bakery
 requests-mock
 django-override-storage
+backports.tarfile

{PyInventory-0.19.3 → pyinventory-0.20.1}/README.md

@@ -143,6 +143,11 @@ please use YunoHost ;)
 * Remove `poetry`, `pytest` and `devshell`
 * Use `pip-tools`, `unittests` and [manage_django_project](https://github.com/jedie/manage_django_project)
 
+### v0.20
+
+Because of security reasons, the `ckeditor` package was replaced by `prose-editor`.
+
+In 0.20.1 we switched to https://github.com/jazzband/django-tinymce/ because `prose-editor` has no table support.
 
 ## Make new release
 
@@ -161,6 +166,13 @@ To make a new release, do this:
 
 [comment]: <> (✂✂✂ auto generated history start ✂✂✂)
 
+* [v0.20.1](https://github.com/jedie/PyInventory/compare/v0.20.0...v0.20.1)
+  * 2024-09-05 - switched to https://github.com/jazzband/django-tinymce/
+* [v0.20.0](https://github.com/jedie/PyInventory/compare/v0.19.3...v0.20.0)
+  * 2024-09-05 - Replace django-ckeditor with django-prose-editor and fix tests
+  * 2024-09-05 - Project updates
+  * 2024-01-16 - Use typeguard in tests
+  * 2024-01-16 - Update requirements
 * [v0.19.3](https://github.com/jedie/PyInventory/compare/v0.19.2...v0.19.3)
   * 2023-11-01 - Auto generate README history
   * 2023-11-01 - Update requirements
@@ -172,6 +184,9 @@ To make a new release, do this:
 * [v0.19.2](https://github.com/jedie/PyInventory/compare/v0.19.1...v0.19.2)
   * 2023-08-17 - Bugfix packaging by adding "requests" as normal dependencies
   * 2023-08-17 - Bugfix packageing by adding "requests" as normal dependencies
+
+<details><summary>Expand older history entries ...</summary>
+
 * [v0.19.1](https://github.com/jedie/PyInventory/compare/v0.19.0...v0.19.1)
   * 2023-08-17 - Update requirements
   * 2023-08-17 - Update from project template
@@ -184,9 +199,6 @@ To make a new release, do this:
   * 2023-07-21 - Update to Django 4.2
   * 2023-07-21 - FIXME: Remove '_reorder_' from ItemModelAdmin.list_display
   * 2023-07-20 - Change item lust: move "producer" to first
-
-<details><summary>Expand older history entries ...</summary>
-
 * [v0.18.1](https://github.com/jedie/PyInventory/compare/v0.18.0...v0.18.1)
   * 2023-07-15 - Update requirements + fix test snapshot
   * 2023-06-11 - Update requirements

{PyInventory-0.19.3 → pyinventory-0.20.1}/inventory/__init__.py

@@ -3,9 +3,9 @@
     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-2023 by the PyInventory team, see AUTHORS for more details.
+    :copyleft: 2020-2024 by the PyInventory team, see AUTHORS for more details.
     :license: GNU GPL v3 or above, see LICENSE for more details.
 """
 
-__version__ = '0.19.3'
+__version__ = '0.20.1'
 __author__ = 'Jens Diemer <PyInventory@jensdiemer.de>'

{PyInventory-0.19.3 → pyinventory-0.20.1}/inventory/migrations/0001_initial.py

@@ -2,7 +2,7 @@
 
 import uuid
 
-import ckeditor_uploader.fields
+
 import django.db.models.deletion
 import tagulous.models.fields
 import tagulous.models.models
@@ -216,7 +216,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     'description',
-                    ckeditor_uploader.fields.RichTextUploadingField(
+                    models.TextField(
                         help_text='LocationModel.description.help_text',
                         verbose_name='LocationModel.description.verbose_name',
                     ),
@@ -305,7 +305,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     'description',
-                    ckeditor_uploader.fields.RichTextUploadingField(
+                    models.TextField(
                         blank=True,
                         help_text='ItemModel.description.help_text',
                         null=True,

{PyInventory-0.19.3 → pyinventory-0.20.1}/inventory/migrations/0003_auto_20201024_1830.py

@@ -1,7 +1,8 @@
 # Generated by Django 2.2.16 on 2020-10-24 16:30
 
-import ckeditor_uploader.fields
+
 from django.db import migrations
+from django.db.models import TextField
 
 
 class Migration(migrations.Migration):
@@ -13,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='locationmodel',
             name='description',
-            field=ckeditor_uploader.fields.RichTextUploadingField(
+            field=TextField(
                 blank=True,
                 help_text='LocationModel.description.help_text',
                 null=True,

{PyInventory-0.19.3 → pyinventory-0.20.1}/inventory/migrations/0009_add_memo.py

@@ -2,7 +2,7 @@
 
 import uuid
 
-import ckeditor_uploader.fields
+
 import django.db.models.deletion
 import django_tools.serve_media_app.models
 import tagulous.models.fields
@@ -194,7 +194,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     'memo',
-                    ckeditor_uploader.fields.RichTextUploadingField(
+                    models.TextField(
                         blank=True,
                         help_text='MemoModel.description.help_text',
                         null=True,

pyinventory-0.20.1/inventory/migrations/0014_alter_itemmodel_description_and_more.py

@@ -0,0 +1,44 @@
+# Generated by Django 5.1.1 on 2024-09-05 17:46
+
+import tinymce.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('inventory', '0013_alter_itemmodel_location'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='itemmodel',
+            name='description',
+            field=tinymce.models.HTMLField(
+                blank=True,
+                help_text='ItemModel.description.help_text',
+                null=True,
+                verbose_name='ItemModel.description.verbose_name',
+            ),
+        ),
+        migrations.AlterField(
+            model_name='locationmodel',
+            name='description',
+            field=tinymce.models.HTMLField(
+                blank=True,
+                help_text='LocationModel.description.help_text',
+                null=True,
+                verbose_name='LocationModel.description.verbose_name',
+            ),
+        ),
+        migrations.AlterField(
+            model_name='memomodel',
+            name='memo',
+            field=tinymce.models.HTMLField(
+                blank=True,
+                help_text='MemoModel.description.help_text',
+                null=True,
+                verbose_name='MemoModel.description.verbose_name',
+            ),
+        ),
+    ]

{PyInventory-0.19.3 → pyinventory-0.20.1}/inventory/models/item.py

@@ -3,12 +3,12 @@ from pathlib import Path
 
 import tagulous.models
 from bx_django_utils.filename import clean_filename
-from ckeditor_uploader.fields import RichTextUploadingField
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django_tools.model_version_protect.models import VersionProtectBaseModel
 from django_tools.serve_media_app.models import user_directory_path
+from tinymce.models import HTMLField
 
 from inventory.models.base import BaseItemAttachmentModel, BaseParentTreeModel
 from inventory.models.links import BaseLink
@@ -46,10 +46,9 @@ class ItemModel(BaseParentTreeModel, VersionProtectBaseModel):
         verbose_name=_('ItemModel.producer.verbose_name'),
         help_text=_('ItemModel.producer.help_text'),
     )
-    description = RichTextUploadingField(
+    description = HTMLField(
         blank=True,
         null=True,
-        config_name='ItemModel.description',
         verbose_name=_('ItemModel.description.verbose_name'),
         help_text=_('ItemModel.description.help_text'),
     )

{PyInventory-0.19.3 → pyinventory-0.20.1}/inventory/models/location.py

@@ -1,6 +1,6 @@
-from ckeditor_uploader.fields import RichTextUploadingField
 from django.utils.translation import gettext_lazy as _
 from django_tools.model_version_protect.models import VersionProtectBaseModel
+from tinymce.models import HTMLField
 
 from inventory.models.base import BaseParentTreeModel
 
@@ -10,10 +10,9 @@ class LocationModel(BaseParentTreeModel, VersionProtectBaseModel):
     A Storage for items.
     """
 
-    description = RichTextUploadingField(
+    description = HTMLField(
         blank=True,
         null=True,
-        config_name='LocationModel.description',
         verbose_name=_('LocationModel.description.verbose_name'),
         help_text=_('LocationModel.description.help_text'),
     )

{PyInventory-0.19.3 → pyinventory-0.20.1}/inventory/models/memo.py

@@ -2,12 +2,12 @@ import logging
 from pathlib import Path
 
 from bx_django_utils.filename import clean_filename
-from ckeditor_uploader.fields import RichTextUploadingField
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django_tools.model_version_protect.models import VersionProtectBaseModel
 from django_tools.serve_media_app.models import user_directory_path
+from tinymce.models import HTMLField
 
 from inventory.models.base import BaseMemoAttachmentModel, BaseModel
 from inventory.models.links import BaseLink
@@ -18,13 +18,12 @@ logger = logging.getLogger(__name__)
 
 class MemoModel(BaseModel, VersionProtectBaseModel):
     """
-    A Memo to hold some information independ of items/location
+    A Memo to hold some information independent of items/location
     """
 
-    memo = RichTextUploadingField(
+    memo = HTMLField(
         blank=True,
         null=True,
-        config_name='MemoModel.description',
         verbose_name=_('MemoModel.description.verbose_name'),
         help_text=_('MemoModel.description.help_text'),
     )