Merge branch 'master' of https://github.com/LQDJudge/online-judge
This commit is contained in:
commit
b9fc7bcb06
2 changed files with 2 additions and 9 deletions
|
@ -125,8 +125,8 @@ class RegistrationView(OldRegistrationView):
|
||||||
profile.organizations.add(*cleaned_data["organizations"])
|
profile.organizations.add(*cleaned_data["organizations"])
|
||||||
profile.save()
|
profile.save()
|
||||||
|
|
||||||
if newsletter_id is not None and cleaned_data["newsletter"]:
|
#if newsletter_id is not None and cleaned_data["newsletter"]:
|
||||||
Subscription(user=user, newsletter_id=newsletter_id, subscribed=True).save()
|
# Subscription(user=user, newsletter_id=newsletter_id, subscribed=True).save()
|
||||||
return user
|
return user
|
||||||
|
|
||||||
def get_initial(self, *args, **kwargs):
|
def get_initial(self, *args, **kwargs):
|
||||||
|
|
|
@ -84,13 +84,6 @@
|
||||||
<div class="form-field-error">{{ form.organizations.errors }}</div>
|
<div class="form-field-error">{{ form.organizations.errors }}</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if form.newsletter %}
|
|
||||||
<div style="padding-top: 0.5em;">{{ form.newsletter }}
|
|
||||||
<label for="id_newsletter" style="float: unset;"
|
|
||||||
class="inline-header grayed">{{ _('Notify me about upcoming contests') }}</label>
|
|
||||||
</div>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if form.captcha %}
|
{% if form.captcha %}
|
||||||
<div style="margin-top: 0.5em">{{ form.captcha }}</div>
|
<div style="margin-top: 0.5em">{{ form.captcha }}</div>
|
||||||
{% if form.captcha.errors %}
|
{% if form.captcha.errors %}
|
||||||
|
|
Loading…
Reference in a new issue