lgcosta/paperless-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more cleanup

Browse Source
This commit is contained in:
shamoon 2024-10-08 23:26:47 -07:00
parent 64c4ab5770
commit 5abb4b12f2
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -600,16 +600,12 @@ def run_workflows(
): ):
permissions = { permissions = {
"view": { "view": {
"users": action.assign_view_users.values_list("id", flat=True) "users": action.assign_view_users.values_list("id", flat=True),
or [], "groups": action.assign_view_groups.values_list("id", flat=True),
"groups": action.assign_view_groups.values_list("id", flat=True)
or [],
}, },
"change": { "change": {
"users": action.assign_change_users.values_list("id", flat=True) "users": action.assign_change_users.values_list("id", flat=True),
or [], "groups": action.assign_change_groups.values_list("id", flat=True),
"groups": action.assign_change_groups.values_list("id", flat=True)
or [],
}, },
} }
if not use_overrides: if not use_overrides:
@ -758,11 +754,11 @@ def run_workflows(
overrides.owner_id = None overrides.owner_id = None
if action.remove_all_permissions: if action.remove_all_permissions:
permissions = {
"view": {"users": [], "groups": []},
"change": {"users": [], "groups": []},
}
if not use_overrides: if not use_overrides:
permissions = {
"view": {"users": [], "groups": []},
"change": {"users": [], "groups": []},
}
set_permissions_for_object( set_permissions_for_object(
permissions=permissions, permissions=permissions,
object=document, object=document,
@ -859,10 +855,9 @@ def run_workflows(
# Otherwise, this instance might be behind and overwrite the work another process did # Otherwise, this instance might be behind and overwrite the work another process did
document.refresh_from_db() document.refresh_from_db()
doc_tag_ids = list(document.tags.values_list("pk", flat=True)) doc_tag_ids = list(document.tags.values_list("pk", flat=True))
else:
doc_tag_ids = overrides.tag_ids or []
if matching.document_matches_workflow(document, workflow, trigger_type): if matching.document_matches_workflow(document, workflow, trigger_type):
action: WorkflowAction
for action in workflow.actions.all(): for action in workflow.actions.all():
message = f"Applying {action} from {workflow}" message = f"Applying {action} from {workflow}"
if not use_overrides: if not use_overrides: