File tree Expand file tree Collapse file tree 3 files changed +4
-5
lines changed
Expand file tree Collapse file tree 3 files changed +4
-5
lines changed Original file line number Diff line number Diff line change @@ -19,12 +19,10 @@ RUN npm run webpack
1919FROM docker.io/python:3.12-slim-bookworm
2020MAINTAINER Computer Science House <webmaster@csh.rit.edu>
2121
22- RUN mkdir /opt/conditional
22+ WORKDIR /opt/conditional
2323
2424COPY requirements.txt /opt/conditional
2525
26- WORKDIR /opt/conditional
27-
2826RUN apt-get -yq update && \
2927 apt-get -yq install libsasl2-dev libldap2-dev libldap-common libssl-dev gcc g++ make && \
3028 pip install -r requirements.txt && \
@@ -35,6 +33,7 @@ ENV PORT=${PORT}
3533EXPOSE ${PORT}
3634
3735COPY conditional /opt/conditional/conditional
36+ COPY migrations /opt/conditional/migrations
3837COPY *.py package.json /opt/conditional/
3938COPY --from=build-frontend /opt/conditional/conditional/static/ /opt/conditional/conditional/static/
4039
Original file line number Diff line number Diff line change @@ -92,7 +92,7 @@ def display_dashboard(user_dict=None):
9292 "time_spent" : p .time_spent ,
9393 "skills" : p .skills ,
9494 "desc" : p .description ,
95- "links" : list (filter (None , p .links .split ("\n " ))),
95+ "links" : [] if p . links is None else list (filter (None , p .links .split ("\n " ))),
9696 "status" : p .status ,
9797 }
9898 for p in get_project_list ().filter (MajorProject .uid == uid )
Original file line number Diff line number Diff line change @@ -53,7 +53,7 @@ def display_major_project(user_dict=None):
5353 "time_spent" : p .time_spent ,
5454 "skills" : p .skills ,
5555 "desc" : p .description ,
56- "links" : list (filter (None , p .links .split ("\n " ))),
56+ "links" : [] if p . links is None else list (filter (None , p .links .split ("\n " ))),
5757 "status" : p .status ,
5858 "is_owner" : bool (user_dict ["username" ] == p .uid ),
5959 "files" : list_files_in_folder (bucket , f"{ p .id } /" )
You can’t perform that action at this time.
0 commit comments