paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-08-24 01:06:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: empty strings for consumption template fields should be treated as None (#4762)

Browse Source
This commit is contained in:
shamoon
2023-12-03 12:57:43 -08:00
committed by GitHub
parent 47a2ded30d
commit 285a4b5aef
2 changed files with 61 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/documents/serialisers.py
View File

@@ -1171,10 +1171,19 @@ class ConsumptionTemplateSerializer(serializers.ModelSerializer):
def validate(self, attrs):
if ("filter_mailrule") in attrs and attrs["filter_mailrule"] is not None:
attrs["sources"] = {DocumentSource.MailFetch.value}
# Empty strings treated as None to avoid unexpected behavior
if ("assign_title") in attrs and len(attrs["assign_title"]) == 0:
attrs["assign_title"] = None
if "filter_filename" in attrs and len(attrs["filter_filename"]) == 0:
attrs["filter_filename"] = None
if "filter_path" in attrs and len(attrs["filter_path"]) == 0:
attrs["filter_path"] = None
if (
("filter_mailrule" not in attrs)
and ("filter_filename" not in attrs or len(attrs["filter_filename"]) == 0)
and ("filter_path" not in attrs or len(attrs["filter_path"]) == 0)
"filter_mailrule" not in attrs
and ("filter_filename" not in attrs or attrs["filter_filename"] is None)
and ("filter_path" not in attrs or attrs["filter_path"] is None)
):
raise serializers.ValidationError(
"File name, path or mail rule filter are required",