diff --git a/src/gms/settings.py b/src/gms/settings.py index e4ce4ef8774f318df2a0d20883644735abd2dd9d..f85d7625b5a0cbf10c3e0ee7bb362eca9749ef95 100644 --- a/src/gms/settings.py +++ b/src/gms/settings.py @@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/2.1/ref/settings/ from gms.settings_local import * # DEBUG ALLOW -ALLOWED_HOSTS = ['127.0.0.1', 'localhost', "130.95.13.36"] +ALLOWED_HOSTS = ['127.0.0.1', 'localhost', "130.95.13.36","portal.ucc.asn.au"] # Application definition diff --git a/src/memberdb/account_backend.py b/src/memberdb/account_backend.py index 697f95a4a56939e9f8784e7915e36ef20a7f236d..a2174438c451734b5803145fe23c8cb680a7c997 100644 --- a/src/memberdb/account_backend.py +++ b/src/memberdb/account_backend.py @@ -31,7 +31,7 @@ ldap_user_dn = getattr(settings, 'LDAP_USER_SEARCH_DN') ldap_base_dn = getattr(settings, 'LDAP_BASE_DN') ldap_bind_dn = getattr(settings, 'LDAP_BIND_DN') ldap_bind_secret = getattr(settings, 'LDAP_BIND_SECRET') -make_home_cmd = ["sudo", "python3", "root_actions.py"] +make_home_cmd = ["sudo", "/services/uccportal/src/memberdb/root_actions.py"] make_mail_cmd = 'ssh -i %s root@mooneye "/usr/local/mailman/bin/add_members" -r- ucc-announce <<< %s@ucc.asn.au' make_mail_key = './mooneye.key' diff --git a/src/memberdb/models.py b/src/memberdb/models.py index 57dddd6000a3d874f0a9cc427a3d328490323812..d200ad930a9b0174c3a911e06a79e61033978eaa 100644 --- a/src/memberdb/models.py +++ b/src/memberdb/models.py @@ -157,7 +157,7 @@ class Member (IncAssocMember): # data to be entered by user and validated (mostly) manually display_name = models.CharField ('Display name', max_length=200) - username = models.SlugField ('Username', max_length=32, null=True, blank=True, unique=True, validators=[RegexValidator(regex='^[a-z0-9._-]*$')]) + username = models.SlugField ('Username', max_length=32, null=True, blank=True, unique=False, validators=[RegexValidator(regex='^[a-z0-9._-]*$')]) phone_number = models.CharField ('Phone number', max_length=20, blank=False, validators=[RegexValidator(regex='^\+?[0-9() -]+$')]) is_student = models.BooleanField ('Student', default=True, blank=True, help_text="Tick this box if you are a current student at a secondary or tertiary institution in WA") is_guild = models.BooleanField ('UWA Guild member', default=True, blank=True) diff --git a/src/memberdb/register.py b/src/memberdb/register.py index 0300178ec433b65048214e97c4d91af3e769dbe6..4167c7fa9ab24a53a0545a5cb511d8f8e44114c5 100644 --- a/src/memberdb/register.py +++ b/src/memberdb/register.py @@ -36,7 +36,6 @@ class RegisterRenewForm(MyModelForm): fields = ['first_name', 'last_name', 'phone_number', 'is_student', 'is_guild', 'id_number', 'id_desc', 'email_address'] error_messages = { 'username': { - 'unique': 'This username is already taken, please pick another one.', 'invalid': 'Please pick a username with only lowercase letters and numbers' } } diff --git a/src/memberdb/root_actions.py b/src/memberdb/root_actions.py index 4c6089e86f5dbbbc9a0d68704088b607a752c92a..5fffc687013caaa8922214fa54e4440f64c3f74a 100644 --- a/src/memberdb/root_actions.py +++ b/src/memberdb/root_actions.py @@ -1,3 +1,4 @@ +#!/bin/python3 import sys import os import shutil diff --git a/src/memberdb/urls.py b/src/memberdb/urls.py index 5c2f6545e5d61021af8d700ba7459fabbf4015fb..4dce9419bb1a1fd0a5142b6eac0a3a65d3f3f52d 100644 --- a/src/memberdb/urls.py +++ b/src/memberdb/urls.py @@ -19,7 +19,7 @@ urlpatterns = [ path('admin/logout/', auth_views.LogoutView.as_view(template_name='logout.html')), # for members to "login" before having created a user account - path('login/<username>/<member_token>/', MemberTokenView.as_view(), name='login_member'), + path('login/<id>/<member_token>/', MemberTokenView.as_view(), name='login_member'), # email confirmation path('confirm/<int:pk>/<str:token>/', EmailConfirmView.as_view(), name='email_confirm'), diff --git a/src/memberdb/views.py b/src/memberdb/views.py index ae6c507f96044fe8b16253b78a76fd9730f2e5b1..32ce1762d16d3600082f85af132c44d7dedc60a3 100644 --- a/src/memberdb/views.py +++ b/src/memberdb/views.py @@ -148,7 +148,7 @@ class MemberTokenView(View): try: member = Member.objects.get( login_token=kwargs['member_token'], - username=kwargs['username'], + id=kwargs['id'], created__gte=week_ago ) except Member.DoesNotExist: