From 9e8764d28ae22bcf47c1b3e2914f814762246e41 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 21 May 2026 09:27:08 +0000 Subject: [PATCH] Fix conflict (for now) --- src/backend/InvenTree/InvenTree/models.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/backend/InvenTree/InvenTree/models.py b/src/backend/InvenTree/InvenTree/models.py index 2a827e5b6f..68e28518ed 100644 --- a/src/backend/InvenTree/InvenTree/models.py +++ b/src/backend/InvenTree/InvenTree/models.py @@ -664,15 +664,16 @@ class InvenTreeNoteMixin(InvenTreePermissionCheckMixin): 'common.Note', content_type_field='model_type', object_id_field='model_id' ) - @property - def notes(self) -> QuerySet: - """Return a queryset containing all notes for this model.""" - # Check the query cache for pre-fetched parameters - if cache := getattr(self, '_prefetched_objects_cache', None): - if 'notes_list' in cache: - return cache['notes_list'] + # TODO: Un-comment this once the InvenTreeNotesMixin class is removed + # @property + # def notes(self) -> QuerySet: + # """Return a queryset containing all notes for this model.""" + # # Check the query cache for pre-fetched parameters + # if cache := getattr(self, '_prefetched_objects_cache', None): + # if 'notes_list' in cache: + # return cache['notes_list'] - return self.notes_list.all() + # return self.notes_list.all() def delete(self, *args, **kwargs): """Handle the deletion of a model instance.