diff --git a/changelog.md b/changelog.md index dda21a420..bfe105012 100644 --- a/changelog.md +++ b/changelog.md @@ -2,7 +2,7 @@ -## [3.0.1] - 2024-01-xx +## [3.0.1] - 2024-01-13 ### Fixed diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index d4b28b3cf..1d1167e67 100644 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -50,7 +50,8 @@ COPY ./papermerge ${CORE_APP}/papermerge/ COPY ./docker/prod/config ${CORE_APP}/config COPY ./docker/prod/manage.py ${CORE_APP}/manage.py -COPY ./docker/dev/scripts/ /usr/bin/ +COPY ./docker/prod/scripts/ /usr/bin/ +RUN chmod +x /usr/bin/*.sh RUN chmod +x /run.bash COPY --from=token_validator /tivoli_app/ /tivoli_app diff --git a/papermerge/core/db/nodes.py b/papermerge/core/db/nodes.py index 6a6629d4a..468c46cbb 100644 --- a/papermerge/core/db/nodes.py +++ b/papermerge/core/db/nodes.py @@ -59,7 +59,8 @@ def get_paginated_nodes( ).options(loader_opt)) count_stmt = select(func.count()).select_from(Node).where( - Node.user_id == user_id + Node.user_id == user_id, + Node.parent_id == parent_id ) items = []