File tree Expand file tree Collapse file tree 2 files changed +10
-13
lines changed
Expand file tree Collapse file tree 2 files changed +10
-13
lines changed Original file line number Diff line number Diff line change @@ -534,9 +534,8 @@ def _get_encrypted_fields(
534534 # An EmbeddedModelField may not have any encrypted fields.
535535 if embedded_result :
536536 field_list .extend (embedded_result ["fields" ])
537- continue
538537 # Populate data for encrypted field.
539- if getattr (field , "encrypted" , False ):
538+ elif getattr (field , "encrypted" , False ):
540539 if create_data_keys :
541540 data_key = connection .client_encryption .create_data_key (
542541 kms_provider = kms_provider ,
Original file line number Diff line number Diff line change @@ -156,14 +156,12 @@ def model_has_encrypted_fields(model):
156156 """
157157 from django_mongodb_backend .fields import EmbeddedModelField # noqa: PLC0415
158158
159- for field in model ._meta .fields :
160- if getattr (field , "encrypted" , False ):
161- return True
162-
163- # Recursively check embedded models.
164- if isinstance (field , EmbeddedModelField ) and model_has_encrypted_fields (
165- field .embedded_model
166- ):
167- return True
168-
169- return False
159+ # Recursively check embedded models.
160+ return any (
161+ getattr (field , "encrypted" , False )
162+ or (
163+ isinstance (field , EmbeddedModelField )
164+ and model_has_encrypted_fields (field .embedded_model )
165+ )
166+ for field in model ._meta .fields
167+ )
You can’t perform that action at this time.
0 commit comments