paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-07-28 18:24:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Backend dependencies update (#5676)

Browse Source
This commit is contained in:
Trenton H
2024-02-08 09:48:24 -08:00
committed by GitHub
parent c508be6ecd
commit b60e16fe33
14 changed files with 718 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/documents/serialisers.py
View File

@@ -82,13 +82,14 @@ class MatchingModelSerializer(serializers.ModelSerializer):
def validate(self, data):
# TODO: remove pending https://github.com/encode/django-rest-framework/issues/7173
name = data["name"] if "name" in data else self.instance.name
name = data.get(
"name",
self.instance.name if hasattr(self.instance, "name") else None,
)
owner = (
data["owner"]
if "owner" in data
else self.user
if hasattr(self, "user")
else None
else self.user if hasattr(self, "user") else None
)
pk = self.instance.pk if hasattr(self.instance, "pk") else None
if ("name" in data or "owner" in data) and self.Meta.model.objects.filter(
@@ -261,7 +262,7 @@ class OwnedObjectSerializer(serializers.ModelSerializer, SetPermissionsMixin):
if "set_permissions" in validated_data:
self._set_permissions(validated_data["set_permissions"], instance)
if "owner" in validated_data and "name" in self.Meta.fields:
name = validated_data["name"] if "name" in validated_data else instance.name
name = validated_data.get("name", instance.name)
not_unique = (
self.Meta.model.objects.exclude(pk=instance.pk)
.filter(owner=validated_data["owner"], name=name)
@@ -443,7 +444,10 @@ class CustomFieldSerializer(serializers.ModelSerializer):
def validate(self, attrs):
# TODO: remove pending https://github.com/encode/django-rest-framework/issues/7173
name = attrs["name"] if "name" in attrs else self.instance.name
name = attrs.get(
"name",
self.instance.name if hasattr(self.instance, "name") else None,
)
if ("name" in attrs) and self.Meta.model.objects.filter(
name=name,
).exists():
@@ -697,10 +701,7 @@ class DocumentSerializer(
custom_field_instance.field,
doc_id,
)
if (
"remove_inbox_tags" in validated_data
and validated_data["remove_inbox_tags"]
):
if validated_data.get("remove_inbox_tags"):
tag_ids_being_added = (
[
tag.id
@@ -1352,7 +1353,7 @@ class BulkEditObjectPermissionsSerializer(serializers.Serializer, SetPermissions
def validate(self, attrs):
object_type = attrs["object_type"]
objects = attrs["objects"]
permissions = attrs["permissions"] if "permissions" in attrs else None
permissions = attrs.get("permissions")
self._validate_objects(objects, object_type)
if permissions is not None:
@@ -1514,7 +1515,7 @@ class WorkflowSerializer(serializers.ModelSerializer):
for trigger in triggers:
filter_has_tags = trigger.pop("filter_has_tags", None)
trigger_instance, _ = WorkflowTrigger.objects.update_or_create(
id=trigger["id"] if "id" in trigger else None,
id=trigger.get("id"),
defaults=trigger,
)
if filter_has_tags is not None:
@@ -1530,7 +1531,7 @@ class WorkflowSerializer(serializers.ModelSerializer):
assign_change_groups = action.pop("assign_change_groups", None)
assign_custom_fields = action.pop("assign_custom_fields", None)
action_instance, _ = WorkflowAction.objects.update_or_create(
id=action["id"] if "id" in action else None,
id=action.get("id"),
defaults=action,
)
if assign_tags is not None:

24
src/documents/signals/handlers.py
View File

@@ -559,15 +559,21 @@ def run_workflow(
try:
document.title = parse_doc_title_w_placeholders(
action.assign_title,
document.correspondent.name
if document.correspondent is not None
else "",
document.document_type.name
if document.document_type is not None
else "",
document.owner.username
if document.owner is not None
else "",
(
document.correspondent.name
if document.correspondent is not None
else ""
),
(
document.document_type.name
if document.document_type is not None
else ""
),
(
document.owner.username
if document.owner is not None
else ""
),
timezone.localtime(document.added),
document.original_filename,
timezone.localtime(document.created),

24
src/documents/views.py
View File

@@ -175,16 +175,16 @@ class IndexView(TemplateView):
context["full_name"] = self.request.user.get_full_name()
context["styles_css"] = f"frontend/{self.get_frontend_language()}/styles.css"
context["runtime_js"] = f"frontend/{self.get_frontend_language()}/runtime.js"
context[
"polyfills_js"
] = f"frontend/{self.get_frontend_language()}/polyfills.js"
context["polyfills_js"] = (
f"frontend/{self.get_frontend_language()}/polyfills.js"
)
context["main_js"] = f"frontend/{self.get_frontend_language()}/main.js"
context[
"webmanifest"
] = f"frontend/{self.get_frontend_language()}/manifest.webmanifest"
context[
"apple_touch_icon"
] = f"frontend/{self.get_frontend_language()}/apple-touch-icon.png"
context["webmanifest"] = (
f"frontend/{self.get_frontend_language()}/manifest.webmanifest"
)
context["apple_touch_icon"] = (
f"frontend/{self.get_frontend_language()}/apple-touch-icon.png"
)
return context
@@ -722,9 +722,9 @@ class SearchResultSerializer(DocumentSerializer, PassUserMixin):
r["__search_hit__"] = {
"score": instance.score,
"highlights": instance.highlights("content", text=doc.content),
"note_highlights": instance.highlights("notes", text=notes)
if doc
else None,
"note_highlights": (
instance.highlights("notes", text=notes) if doc else None
),
"rank": instance.rank,
}