From de261cf334fc3159603e6febb1c5d2b6c67784a1 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 15 Dec 2019 22:42:38 +0100 Subject: [PATCH] Add a default limit participations of 10, fix dockerfile and lint some things Signed-off-by: Thomas Citharel --- docker/tests/Dockerfile | 4 ++-- js/src/views/Event/Edit.vue | 12 ++++++++---- js/src/views/User/SendPasswordReset.vue | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/docker/tests/Dockerfile b/docker/tests/Dockerfile index 28401e76..767f5247 100644 --- a/docker/tests/Dockerfile +++ b/docker/tests/Dockerfile @@ -1,11 +1,11 @@ FROM elixir:latest LABEL maintainer="Thomas Citharel " -ENV REFRESHED_AT=2019-10-06 +ENV REFRESHED_AT=2019-12-15 RUN apt-get update -yq && apt-get install -yq build-essential inotify-tools postgresql-client git curl gnupg xvfb libgtk-3-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 python3-pip RUN curl -sL https://deb.nodesource.com/setup_10.x | bash && apt-get install nodejs -yq RUN npm install -g yarn wait-on RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* RUN mix local.hex --force && mix local.rebar --force -RUN pip3 install mkdocs mkdocs-material pymdown-extensions pygments mkdocs-git-revision-date-plugin +RUN pip3 install mkdocs mkdocs-material pymdown-extensions pygments mkdocs-git-revision-date-localized-plugin RUN curl http://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz --output GeoLite2-City.tar.gz -s && tar zxf GeoLite2-City.tar.gz && mkdir -p /usr/share/GeoIP && mv GeoLite2-City_*/GeoLite2-City.mmdb /usr/share/GeoIP/GeoLite2-City.mmdb diff --git a/js/src/views/Event/Edit.vue b/js/src/views/Event/Edit.vue index 097d4d02..8e8ddccc 100644 --- a/js/src/views/Event/Edit.vue +++ b/js/src/views/Event/Edit.vue @@ -289,6 +289,8 @@ import IdentityPickerWrapper from '@/views/Account/IdentityPickerWrapper.vue'; import { RouteName } from '@/router'; import 'intersection-observer'; +const DEFAULT_LIMIT_NUMBER_OF_PLACES = 10; + @Component({ components: { IdentityPickerWrapper, AddressAutoComplete, TagInput, DateTimePicker, PictureUpload, Editor: EditorComponent }, apollo: { @@ -576,10 +578,12 @@ export default class EditEvent extends Vue { @Watch('limitedPlaces') updatedEventCapacityOptions(limitedPlaces: boolean) { - if (! limitedPlaces) { - this.event.options.maximumAttendeeCapacity = 0 - this.event.options.remainingAttendeeCapacity = 0 - this.event.options.showRemainingAttendeeCapacity = false + if (!limitedPlaces) { + this.event.options.maximumAttendeeCapacity = 0; + this.event.options.remainingAttendeeCapacity = 0; + this.event.options.showRemainingAttendeeCapacity = false; + } else { + this.event.options.maximumAttendeeCapacity = this.event.options.maximumAttendeeCapacity || DEFAULT_LIMIT_NUMBER_OF_PLACES; } } diff --git a/js/src/views/User/SendPasswordReset.vue b/js/src/views/User/SendPasswordReset.vue index fc33e7fc..fc9ca929 100644 --- a/js/src/views/User/SendPasswordReset.vue +++ b/js/src/views/User/SendPasswordReset.vue @@ -63,7 +63,7 @@ export default class SendPasswordReset extends Vue { } removeError(message: string) { - this.errors.splice(this.errors.indexOf(message)) + this.errors.splice(this.errors.indexOf(message)); } async sendResetPasswordTokenAction(e) { @@ -81,7 +81,7 @@ export default class SendPasswordReset extends Vue { } catch (err) { console.error(err); err.graphQLErrors.forEach(({ message }) => { - if (this.errors.indexOf(message) < 0){ + if (this.errors.indexOf(message) < 0) { this.errors.push(message); } });