Merge commit 'd38af61ba2fb3c87143da57ddd92bc4845f85a7c' into block-notes

This commit is contained in:
Oliver Walters
2026-06-01 11:55:47 +00:00
24 changed files with 395 additions and 53 deletions
@@ -1,11 +1,14 @@
"""InvenTree API version information."""
# InvenTree API version
INVENTREE_API_VERSION = 498
INVENTREE_API_VERSION = 499
"""Increment this API version number whenever there is a significant change to the API that any clients need to know about."""
INVENTREE_API_TEXT = """
v499 -> 2026-06-01 : https://github.com/inventree/InvenTree/pull/12057
- Fixes search field issues on the BarcodeScanHistory API endpoint
v498 -> 2026-05-31 : https://github.com/inventree/InvenTree/pull/12055
- Updates the "status_text" field for models which support custom status values
+5
View File
@@ -3539,6 +3539,11 @@ class EmailThread(InvenTree.models.InvenTreeMetadataModel):
unique_together = [['key', 'global_id']]
ordering = ['-updated']
@staticmethod
def get_api_url():
"""Return the API URL associated with the EmailThread model."""
return reverse('api-email-list')
key = models.CharField(
max_length=250,
verbose_name=_('Key'),
@@ -121,3 +121,7 @@ class TransitionTests(InvenTreeTestCase):
self.assertIn(
"ValueError('This is a broken transition plugin!')", str(cm.output[0])
)
# Ensure the plugin is now disabled
registry.set_plugin_state('sample-transition', False)
registry.set_plugin_state('sample-broken-transition', False)
@@ -60,7 +60,7 @@ class TransitionMethod:
**kwargs: Additional keyword arguments for custom logic.
Returns:
result: bool - True if the transition method was successful, False otherwise.
result: bool - True if the transition method was successful (and no further transitions are attempted), False otherwise.
Raises:
ValidationError: Alert the user that the transition failed
@@ -853,11 +853,11 @@ class BarcodeScanResultList(BarcodeScanResultMixin, BulkDeleteMixin, ListAPI):
filterset_class = BarcodeScanResultFilter
filter_backends = SEARCH_ORDER_FILTER
ordering_fields = ['user', 'plugin', 'timestamp', 'endpoint', 'result']
ordering_fields = ['user', 'timestamp', 'endpoint', 'result']
ordering = '-timestamp'
search_fields = ['plugin']
search_fields = ['data']
class BarcodeScanResultDetail(BarcodeScanResultMixin, RetrieveDestroyAPI):
@@ -51,7 +51,9 @@ class AppMixin:
"""
from common.settings import get_global_setting
if settings.PLUGIN_TESTING or get_global_setting('ENABLE_PLUGINS_APP'):
if settings.PLUGIN_TESTING or get_global_setting(
'ENABLE_PLUGINS_APP', create=False
):
logger.info('Registering IntegrationPlugin apps')
apps_changed = False