Commit 02e28b63 authored by Jelle Besseling's avatar Jelle Besseling Committed by Sébastiaan Versteeg

Merge branch 'fix/start-reminder-users' into 'master'

Fix start reminder users slicing

Closes #989

See merge request !1440

(cherry picked from commit a1aba765)

674b28be Fix start reminder users slicing
8e51eca5 Fix docker build
parent f27082b9
...@@ -34,7 +34,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ ...@@ -34,7 +34,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
rm -rf /var/lib/apt rm -rf /var/lib/apt
RUN pip install --no-cache-dir poetry && \ RUN pip install --no-cache-dir poetry && \
poetry config settings.virtualenvs.create false poetry config virtualenvs.create false
WORKDIR /usr/src/app/website/ WORKDIR /usr/src/app/website/
# install python requirements # install python requirements
...@@ -46,7 +46,7 @@ RUN if [ "$install_dev_requirements" -eq 1 ]; then \ ...@@ -46,7 +46,7 @@ RUN if [ "$install_dev_requirements" -eq 1 ]; then \
echo "This will fail if the dependencies are out of date"; \ echo "This will fail if the dependencies are out of date"; \
poetry install --no-interaction --no-dev; \ poetry install --no-interaction --no-dev; \
fi; \ fi; \
poetry cache:clear --all --no-interaction pypi poetry cache clear --all --no-interaction pypi
# Create entry points # Create entry points
COPY resources/entrypoint.sh /usr/local/bin/entrypoint.sh COPY resources/entrypoint.sh /usr/local/bin/entrypoint.sh
......
...@@ -395,8 +395,8 @@ class Event(models.Model, metaclass=ModelTranslateMeta): ...@@ -395,8 +395,8 @@ class Event(models.Model, metaclass=ModelTranslateMeta):
self.start_reminder = start_reminder self.start_reminder = start_reminder
if self.registration_required: if self.registration_required:
self.start_reminder.users.set( self.start_reminder.users.set(
self.participants.filter(member__isnull=False) [r.member for r in self.participants
.values_list('member', flat=True)) if r.member])
else: else:
self.start_reminder.users.set(Member.current_members.all()) self.start_reminder.users.set(Member.current_members.all())
elif start_reminder.pk is not None: elif start_reminder.pk is not None:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment