[bug 778095] Register as contributor

* A migration to add new "Registered as contributor" group
* Add a checkbox to the registration form
* If checkbox is checked, user gets added to the group

apps/questions/templates/questions/includes/aaq_macros.html

@@ -130,7 +130,7 @@ <h2>{{ _('Before you continue, we ask you to create a support account so we can
   <div id="register_form" class="slidebox">
 {# TODO: these may have regressed the layout, h2 -> h3. Check! #}
     <h3 class="slide">{{ _('Create an account') }}</h3>
-    {{ register_form(register, csrf=csrf, action='') }}
+    {{ register_form(register, csrf=csrf, action='', show_checkbox=False) }}
   </div>
 
   <div id="login_form" class="slidebox">

apps/users/forms.py

@@ -106,6 +106,11 @@ class RegisterForm(forms.ModelForm):
         help_text=_lazy(u'Enter the same password as '
                          'above, for verification.'))
 
+    interested = forms.BooleanField(
+        label=_lazy(u'I am interested in volunteering to help other '
+                     'Mozilla users'),
+        required=False)
+
     class Meta(object):
         model = User
         fields = ('username', 'password', 'password2', 'email')

apps/users/models.py

@@ -5,7 +5,7 @@
 import re
 
 from django.conf import settings
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Group
 from django.contrib.sites.models import Site
 from django.core import mail
 from django.db import models
@@ -208,7 +208,7 @@ def activate_user(self, activation_key, request=None):
     def create_inactive_user(self, username, password, email,
                              locale=settings.LANGUAGE_CODE,
                              email_template=None, email_subject=None,
-                             email_data=None):
+                             email_data=None, volunteer_interest=False):
         """
         Create a new, inactive ``User`` and ``Profile``, generates a
         ``RegistrationProfile`` and email its activation key to the
@@ -224,6 +224,11 @@ def create_inactive_user(self, username, password, email,
         self.send_confirmation_email(registration_profile, email_template,
                                      email_subject, email_data)
 
+        if volunteer_interest:
+            statsd.incr('user.registered-as-contributor')
+            group = Group.objects.get(name='Registered as contributor')
+            new_user.groups.add(group)
+
         return new_user
 
     def send_confirmation_email(self, registration_profile,

apps/users/templates/users/includes/macros.html

@@ -38,15 +38,23 @@ <h3>{{ _('Login Problems?') }}</h3>
   </div>
 {%- endmacro %}
 
-{% macro register_form(form, csrf, action=None) -%}
+{% macro register_form(form, csrf, action=None, show_checkbox=True) -%}
   {{ errorlist(form) }}
   <form method="post" action="{{ action if action != None else
                                  url('users.register') }}">
     {{ csrf|safe }}
     <ul>
-      {% for field in form %}
-        <li>{{ field|label_with_help }} {{ field|safe }}</li>
+      {% for field in form if field.name != 'interested' %}
+        <li>{{ field|label_with_help }} {{ field }}</li>
       {% endfor %}
+      {% if show_checkbox %}
+        <li class="checkbox">
+          <label>
+            {{ form.interested }}
+            {{ form.interested.field.label }}
+          </label>
+        </li>
+      {% endif %}
     </ul>
     <div class="submit">
       <input type="submit" name="register" class="btn" value="{{ _('Register') }}" />

apps/users/tests/test_views.py

@@ -15,7 +15,7 @@
 from sumo.urlresolvers import reverse
 from users import ERROR_SEND_EMAIL
 from users.models import Profile, RegistrationProfile, EmailChange, Setting
-from users.tests import profile, user
+from users.tests import profile, user, group
 
 
 class RegisterTests(TestCase):
@@ -46,6 +46,9 @@ def test_new_user(self, get_current):
         key = RegistrationProfile.objects.all()[0].activation_key
         assert mail.outbox[0].body.find('activate/%s/%s' % (u.id, key)) > 0
 
+        # By default, users aren't added to any groups
+        eq_(0, len(u.groups.all()))
+
         # Now try to log in
         u.is_active = True
         u.save()
@@ -197,6 +200,24 @@ def test_old_activation_url(self, get_current):
         user = User.objects.get(pk=user.pk)
         assert user.is_active
 
+    @mock.patch.object(Site.objects, 'get_current')
+    def test_new_contributor(self, get_current):
+        """Verify that interested contributors are added to group."""
+        get_current.return_value.domain = 'su.mo.com'
+        group_name = 'Registered as contributor'
+        group(name=group_name, save=True)
+        data = {
+            'username': 'newbie',
+            'email': 'newbie@example.com',
+            'password': 'foobar22',
+            'password2': 'foobar22',
+            'interested': 'yes'}
+        response = self.client.post(reverse('users.register', locale='en-US'),
+                                    data, follow=True)
+        eq_(200, response.status_code)
+        u = User.objects.get(username='newbie')
+        eq_(group_name, u.groups.all()[0].name)
+
 
 class ChangeEmailTestCase(TestCase):
     fixtures = ['users.json']

apps/users/utils.py

@@ -47,7 +47,8 @@ def handle_register(request, email_template=None, email_subject=None,
                 locale=request.locale,
                 email_template=email_template,
                 email_subject=email_subject,
-                email_data=email_data)
+                email_data=email_data,
+                volunteer_interest=form.cleaned_data['interested'])
             if not form.is_valid():
                 # Delete user if form is not valid, i.e. email was not sent.
                 # This is in a POST request and so always pinned to master,

media/css/users.css

@@ -42,6 +42,15 @@ article.main form label {
     text-align: left;
 }
 
+article.main form li.checkbox label {
+    padding: 0 5px 0 168px;
+    width: auto;
+}
+
+article.main form li.checkbox input {
+    margin: 0 7px 0 0;
+}
+
 article.main form li input {
     margin-top: -8px;
     width: 200px;

migrations/163-registered-as-contributor-group.sql

@@ -0,0 +1 @@
+INSERT INTO `auth_group` (`name`) VALUES ('Registered as contributor');