Skip to content

Last couple of email changes to not delete users if activation is wrong and remove chahub buttons #784

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Didayolo merged 7 commits into from
Mar 21, 2023
Merged

Last couple of email changes to not delete users if activation is wrong and remove chahub buttons #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5272c67
activation link changes
bbearce Mar 15, 2023
f7fb38e
Update views.py
Didayolo Mar 15, 2023
6cb33a8
Merge pull request #779 from codalab/do_not_delete_user_if_validation…
Didayolo Mar 15, 2023
8ac24b2
Remove chahub button from the GUI
Didayolo Mar 16, 2023
4ce043d
Wait until MinIO is up before proceeding
Didayolo Mar 16, 2023
9245900
Merge pull request #782 from codalab/remove-chahub-buttons
Didayolo Mar 16, 2023
6bf601a
Merge pull request #783 from codalab/wait-minio
Didayolo Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions src/apps/profiles/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
8 changes: 0 additions & 8 deletions src/templates/registration/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@ <h2 class="ui blue centered header">
<div class="ui stacked segment">
<form class="ui form" method="POST">
{% csrf_token %}

<div class="field">
<a class="ui fluid basic button" href="{% url 'social:begin' 'chahub' %}">Log in with ChaHub</a>
</div>
<div class="ui horizontal divider form-divider-line">
<span class="form-divider-words">or</span>
</div>

{% if form.non_field_errors %}
<div class="ui red message">
{{ form.non_field_errors }}
Expand Down
11 changes: 0 additions & 11 deletions src/templates/registration/signup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,6 @@ <h2 class="ui blue centered header">
<div class="ui stacked segment">
<form class="ui form" method="post">
{% csrf_token %}

<div class="field">
<a class="ui fluid button" href="{% url 'social:begin' 'chahub' %}">Sign up with ChaHub</a>
</div>
<div class="field">
<a class="ui fluid basic button" href="{{ chahub_signup_url }}" target="_blank">Create a ChaHub
Account</a>
</div>
<div class="ui horizontal divider form-divider-line">
<span class="form-divider-words">Or</span>
</div>
<div class="field">
<div class="ui left icon input">
<i class="user icon"></i>
Expand Down