From 35b72a048e21fe1da6ff45545b5fd5088eca75b3 Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 7 Jun 2025 18:24:01 +0930 Subject: [PATCH] fix(core): clean_fields for created_by field belongs in model that contains field ref: #804 #768 --- app/core/models/centurion_notes.py | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/app/core/models/centurion_notes.py b/app/core/models/centurion_notes.py index d7e2beb4..3f27fba7 100644 --- a/app/core/models/centurion_notes.py +++ b/app/core/models/centurion_notes.py @@ -94,6 +94,18 @@ class CenturionModelNote( table_fields: list = [] + def clean_fields(self, exclude = None): + + if not self.created_by: + + raise ValidationError( + code = 'no_user_supplied', + message = 'No user was supplied for this model note.' + ) + + super().clean_fields(exclude = exclude) + + class NoteMetaModel( CenturionModelNote, @@ -107,19 +119,6 @@ class NoteMetaModel( proxy = False - - def clean(self): - - if not self.created_by: - - raise ValidationError( - code = 'no_user_supplied', - message = 'No user was supplied for this model note.' - ) - - super().clean() - - def clean_fields(self, exclude = None): if not getattr(self, 'model', None): @@ -132,11 +131,11 @@ class NoteMetaModel( self.organization = self.model.organization - if not self.id: + if not self.id and self.created_by is None: self.created_by = self.context['user'] - else: + elif self.id: self.modified_by = self.context['user']