From 5272c673821aa0353d9e68c7914d29dddf621531 Mon Sep 17 00:00:00 2001 From: bbearce Date: Wed, 15 Mar 2023 14:57:42 +0000 Subject: [PATCH 1/4] activation link changes --- src/apps/profiles/views.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/apps/profiles/views.py b/src/apps/profiles/views.py index 93687968f..c446122db 100644 --- a/src/apps/profiles/views.py +++ b/src/apps/profiles/views.py @@ -79,8 +79,7 @@ def activate(request, uidb64, token): messages.success(request, f'Your account is fully setup! Please login.') return redirect('accounts:login') else: - user.delete() - messages.error(request, f"Activation link is invalid. Please sign up again.") + messages.error(request, f"Activation link is invalid. Please double check your link.") return redirect('accounts:signup') return redirect('pages:home') @@ -113,6 +112,10 @@ def sign_up(request): if form.is_valid(): form.save() username = form.cleaned_data.get('username') + #import pdb + #pdb.set_trace() + #if username.find(".") != -1 or username.find("/") != -1: + # message.error(request) raw_password = form.cleaned_data.get('password1') user = authenticate(username=username, password=raw_password) user.is_active = False From f7fb38e60c07b1c56ca9a4a77c1e173e43100c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Pav=C3=A3o?= Date: Wed, 15 Mar 2023 18:26:57 +0100 Subject: [PATCH 2/4] Update views.py --- src/apps/profiles/views.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/apps/profiles/views.py b/src/apps/profiles/views.py index c446122db..50e5cf66a 100644 --- a/src/apps/profiles/views.py +++ b/src/apps/profiles/views.py @@ -112,10 +112,6 @@ def sign_up(request): if form.is_valid(): form.save() username = form.cleaned_data.get('username') - #import pdb - #pdb.set_trace() - #if username.find(".") != -1 or username.find("/") != -1: - # message.error(request) raw_password = form.cleaned_data.get('password1') user = authenticate(username=username, password=raw_password) user.is_active = False From 8ac24b294bc6d30f6c883d0e5bc4098f0c298884 Mon Sep 17 00:00:00 2001 From: didayolo Date: Thu, 16 Mar 2023 16:00:43 +0100 Subject: [PATCH 3/4] Remove chahub button from the GUI --- src/templates/registration/login.html | 8 -------- src/templates/registration/signup.html | 11 ----------- 2 files changed, 19 deletions(-) diff --git a/src/templates/registration/login.html b/src/templates/registration/login.html index 1f147ae29..4ffd5fcb3 100644 --- a/src/templates/registration/login.html +++ b/src/templates/registration/login.html @@ -9,14 +9,6 @@

{% csrf_token %} - -
- Log in with ChaHub -
-
- or -
- {% if form.non_field_errors %}
{{ form.non_field_errors }} diff --git a/src/templates/registration/signup.html b/src/templates/registration/signup.html index 0d2db6c28..f5d5ca78b 100644 --- a/src/templates/registration/signup.html +++ b/src/templates/registration/signup.html @@ -14,17 +14,6 @@

{% csrf_token %} - -
- Sign up with ChaHub -
-
- Create a ChaHub - Account -
-
- Or -
From 4ce043dfe6df7688bd7ca78ad4c0aad1bf1aff55 Mon Sep 17 00:00:00 2001 From: didayolo Date: Thu, 16 Mar 2023 20:02:35 +0100 Subject: [PATCH 4/4] Wait until MinIO is up before proceeding --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3c6e24a3a..38b05b8d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -70,7 +70,7 @@ services: /bin/sh -c " set -x while ! nc -z minio 9000; echo 'Waiting for minio to startup...' && sleep 0.1; sleep 3; - /usr/bin/mc config host add minio_docker http://minio:$MINIO_PORT $MINIO_ACCESS_KEY $MINIO_SECRET_KEY; + until (/usr/bin/mc config host add minio_docker http://minio:$MINIO_PORT $MINIO_ACCESS_KEY $MINIO_SECRET_KEY) do echo '...waiting...' && sleep 1; done; /usr/bin/mc mb minio_docker/$AWS_STORAGE_BUCKET_NAME; /usr/bin/mc mb minio_docker/$AWS_STORAGE_PRIVATE_BUCKET_NAME; /usr/bin/mc policy set download minio_docker/$AWS_STORAGE_BUCKET_NAME;