From 10be8b64129eca1519de69ad899365bbe65f26ed Mon Sep 17 00:00:00 2001 From: lander Date: Sat, 20 Apr 2024 21:05:04 +0200 Subject: [PATCH 1/2] chore: commit before merge --- development.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/development.sh b/development.sh index 6bea4173..76e95999 100755 --- a/development.sh +++ b/development.sh @@ -95,16 +95,16 @@ if [ "$data" != "" ]; then rm -f db.sqlite3 > /dev/null 2>&1 echo "Setting up workspace..." - python -m venv .venv_dev > /dev/null + python3.11 -m venv .venv_dev > /dev/null source .venv_dev/bin/activate pip install poetry > /dev/null poetry install > /dev/null echo "Migrating database..." - python manage.py migrate > /dev/null + python3.11 manage.py migrate > /dev/null echo "Filling $data database..." - python manage.py loaddata */fixtures/$data/* > /dev/null 2>&1 + python3.11 manage.py loaddata */fixtures/$data/* > /dev/null 2>&1 echo "Resetting workspace..." deactivate From 36272da75dee2ae2570d9d8a2d2f04d82e829543 Mon Sep 17 00:00:00 2001 From: lander Date: Sun, 21 Apr 2024 13:38:57 +0200 Subject: [PATCH 2/2] fix: Groups should only be locked when the start date of the project is AFTER the current date --- frontend/src/types/Project.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/types/Project.ts b/frontend/src/types/Project.ts index a68dc8f1..c73b8a09 100644 --- a/frontend/src/types/Project.ts +++ b/frontend/src/types/Project.ts @@ -91,7 +91,7 @@ export class Project { * @returns True if the project is locked, false otherwise. */ public isLocked(): boolean { - return !this.visible || this.archived || this.locked_groups || moment(this.start_date).isBefore(); + return !this.visible || this.archived || this.locked_groups || moment(this.start_date).isAfter(); } /**