From 8c2a95ae106204e30d7af8bcdac6e50f44cd1882 Mon Sep 17 00:00:00 2001 From: Tyler Allen Date: Tue, 17 Mar 2026 17:11:31 -0400 Subject: [PATCH 1/2] add migrations (#514) --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c7acca14..c1a0e49c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,12 +19,10 @@ RUN npm run webpack FROM docker.io/python:3.12-slim-bookworm MAINTAINER Computer Science House -RUN mkdir /opt/conditional +WORKDIR /opt/conditional COPY requirements.txt /opt/conditional -WORKDIR /opt/conditional - RUN apt-get -yq update && \ apt-get -yq install libsasl2-dev libldap2-dev libldap-common libssl-dev gcc g++ make && \ pip install -r requirements.txt && \ @@ -35,6 +33,7 @@ ENV PORT=${PORT} EXPOSE ${PORT} COPY conditional /opt/conditional/conditional +COPY migrations /opt/conditional/migrations COPY *.py package.json /opt/conditional/ COPY --from=build-frontend /opt/conditional/conditional/static/ /opt/conditional/conditional/static/ From 4540db5df959e49e0efd78edead1482114fb3fcf Mon Sep 17 00:00:00 2001 From: Noah Hanford Date: Tue, 17 Mar 2026 19:14:30 -0400 Subject: [PATCH 2/2] fix everything blowing up when old major projects exist (#515) --- conditional/blueprints/dashboard.py | 2 +- conditional/blueprints/major_project_submission.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conditional/blueprints/dashboard.py b/conditional/blueprints/dashboard.py index 786b9a9d..44a88037 100644 --- a/conditional/blueprints/dashboard.py +++ b/conditional/blueprints/dashboard.py @@ -92,7 +92,7 @@ def display_dashboard(user_dict=None): "time_spent": p.time_spent, "skills": p.skills, "desc": p.description, - "links": list(filter(None, p.links.split("\n"))), + "links": [] if p.links is None else list(filter(None, p.links.split("\n"))), "status": p.status, } for p in get_project_list().filter(MajorProject.uid == uid) diff --git a/conditional/blueprints/major_project_submission.py b/conditional/blueprints/major_project_submission.py index ae89c073..a11b81a1 100644 --- a/conditional/blueprints/major_project_submission.py +++ b/conditional/blueprints/major_project_submission.py @@ -53,7 +53,7 @@ def display_major_project(user_dict=None): "time_spent": p.time_spent, "skills": p.skills, "desc": p.description, - "links": list(filter(None, p.links.split("\n"))), + "links": [] if p.links is None else list(filter(None, p.links.split("\n"))), "status": p.status, "is_owner": bool(user_dict["username"] == p.uid), "files": list_files_in_folder(bucket, f"{p.id}/")