Skip to content

Commit

Permalink
minor adjustments (#304)
Browse files Browse the repository at this point in the history
  • Loading branch information
ciur committed Jan 13, 2024
1 parent 58e0852 commit ba1b048
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!-- towncrier release notes start -->

## [3.0.1] - 2024-01-xx
## [3.0.1] - 2024-01-13

### Fixed

Expand Down
3 changes: 2 additions & 1 deletion docker/prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion papermerge/core/db/nodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down

0 comments on commit ba1b048

Please sign in to comment.