diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b181320b..e7f19ad8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - name: Tests - run: make ci + run: make ci BIN_DOCKER_COMPOSE="docker compose" - uses: codecov/codecov-action@v1 with: diff --git a/Makefile b/Makefile index 5387166d..205f33cc 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,9 @@ help: @grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' -compose = docker-compose -p permacoop +BIN_DOCKER_COMPOSE=docker-compose + +compose = ${BIN_DOCKER_COMPOSE} -p permacoop run_server = ./tools/colorize_prefix.sh [server] 31 run_watch = ./tools/colorize_prefix.sh [watch] 36 diff --git a/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts b/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts index 36fc147c..0e591589 100644 --- a/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts +++ b/src/Infrastructure/HumanResource/Leave/Controller/ListLeaveRequestsController.ts @@ -54,11 +54,14 @@ export class ListLeaveRequestsController { userId ); + const calendarToken = process.env.CALENDAR_TOKEN; + return { table, overviewTable, pagination, - currentPage: dto.page + currentPage: dto.page, + calendarToken }; } } diff --git a/src/templates/pages/leave_requests/list.njk b/src/templates/pages/leave_requests/list.njk index 41e7e67a..db56dbb9 100644 --- a/src/templates/pages/leave_requests/list.njk +++ b/src/templates/pages/leave_requests/list.njk @@ -15,6 +15,16 @@ {{ links.add(path('people_leave_requests_add'), text='leave-requests-add-title'|trans) }} +