Merge branch 'master' of https://github.com/LQDJudge/online-judge

judge/views/register.py

@@ -125,8 +125,8 @@ class RegistrationView(OldRegistrationView):
         profile.organizations.add(*cleaned_data["organizations"])
         profile.save()
 
-        if newsletter_id is not None and cleaned_data["newsletter"]:
-            Subscription(user=user, newsletter_id=newsletter_id, subscribed=True).save()
+        #if newsletter_id is not None and cleaned_data["newsletter"]:
+        #    Subscription(user=user, newsletter_id=newsletter_id, subscribed=True).save()
         return user
 
     def get_initial(self, *args, **kwargs):

templates/registration/registration_form.html

@@ -84,13 +84,6 @@
                 <div class="form-field-error">{{ form.organizations.errors }}</div>
             {% 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 %}
                 <div style="margin-top: 0.5em">{{ form.captcha }}</div>
                 {% if form.captcha.errors %}