Remove adding name by GG form
This commit is contained in:
parent
af74edecbb
commit
d49a41d56b
4 changed files with 5 additions and 16 deletions
|
@ -514,9 +514,6 @@ NEWSLETTER_BATCH_DELAY = 60
|
||||||
# Number of emails in one batch
|
# Number of emails in one batch
|
||||||
NEWSLETTER_BATCH_SIZE = 100
|
NEWSLETTER_BATCH_SIZE = 100
|
||||||
|
|
||||||
# Google form to request name
|
|
||||||
REGISTER_NAME_URL = None
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
with open(os.path.join(os.path.dirname(__file__), "local_settings.py")) as f:
|
with open(os.path.join(os.path.dirname(__file__), "local_settings.py")) as f:
|
||||||
exec(f.read(), globals())
|
exec(f.read(), globals())
|
||||||
|
|
|
@ -52,6 +52,7 @@ def fix_unicode(string, unsafe=tuple("\u202a\u202b\u202d\u202e")):
|
||||||
string + (sum(k in unsafe for k in string) - string.count("\u202c")) * "\u202c"
|
string + (sum(k in unsafe for k in string) - string.count("\u202c")) * "\u202c"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class UserForm(ModelForm):
|
class UserForm(ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = User
|
model = User
|
||||||
|
@ -59,6 +60,7 @@ class UserForm(ModelForm):
|
||||||
"first_name",
|
"first_name",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
class ProfileForm(ModelForm):
|
class ProfileForm(ModelForm):
|
||||||
if newsletter_id is not None:
|
if newsletter_id is not None:
|
||||||
newsletter = forms.BooleanField(
|
newsletter = forms.BooleanField(
|
||||||
|
|
|
@ -443,8 +443,8 @@ def edit_profile(request):
|
||||||
request,
|
request,
|
||||||
"user/edit-profile.html",
|
"user/edit-profile.html",
|
||||||
{
|
{
|
||||||
"edit_name_url": settings.REGISTER_NAME_URL,
|
"require_staff_2fa": settings.DMOJ_REQUIRE_STAFF_2FA,
|
||||||
"require_staff_2fa": settings.DMOJ_REQUIRE_STAFF_2FA, 'form_user': form_user,
|
"form_user": form_user,
|
||||||
"form": form,
|
"form": form,
|
||||||
"title": _("Edit profile"),
|
"title": _("Edit profile"),
|
||||||
"profile": profile,
|
"profile": profile,
|
||||||
|
|
|
@ -94,16 +94,6 @@
|
||||||
|
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
|
|
||||||
{% if edit_name_url %}
|
|
||||||
<div style="margin-bottom: 1em; font-size: 1.1em">
|
|
||||||
<label style="color:#666">{{_('Name and School')}}:</label>
|
|
||||||
<span>
|
|
||||||
<a href="{{edit_name_url}}">{{_('Enter this form')}}</a>
|
|
||||||
<span style="float: right">({{_('It takes some time for admin to approve')}})</span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
<div class="block-header" style="display:flex;">
|
<div class="block-header" style="display:flex;">
|
||||||
<div style="margin: auto 0;"> {{ _('Fullname') }}: </div>
|
<div style="margin: auto 0;"> {{ _('Fullname') }}: </div>
|
||||||
<div style="margin-left: 30px;"> {{ form_user.first_name }} </div>
|
<div style="margin-left: 30px;"> {{ form_user.first_name }} </div>
|
||||||
|
|
Loading…
Reference in a new issue