From a437cdd632ce5cc68514effc921fae58d16271d5 Mon Sep 17 00:00:00 2001
From: Daan Sprenkels <hello@dsprenkels.com>
Date: Fri, 3 Nov 2017 11:48:58 +0100
Subject: [PATCH] Disable registration and add study field to user model

---
 .../marietje/migrations/0005_user_study.py    | 20 ++++++++++
 marietje/marietje/models.py                   |  1 +
 .../templates/registration/login.html         |  2 +-
 .../templates/registration/register.html      | 38 +++----------------
 marietje/marietje/views.py                    | 28 +-------------
 5 files changed, 29 insertions(+), 60 deletions(-)
 create mode 100644 marietje/marietje/migrations/0005_user_study.py

diff --git a/marietje/marietje/migrations/0005_user_study.py b/marietje/marietje/migrations/0005_user_study.py
new file mode 100644
index 0000000..151b5d1
--- /dev/null
+++ b/marietje/marietje/migrations/0005_user_study.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.7 on 2017-11-03 10:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('marietje', '0004_user_reset_token'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='study',
+            field=models.CharField(blank=True, max_length=30, verbose_name='study'),
+        ),
+    ]
diff --git a/marietje/marietje/models.py b/marietje/marietje/models.py
index 0a1d59e..56beeea 100644
--- a/marietje/marietje/models.py
+++ b/marietje/marietje/models.py
@@ -77,6 +77,7 @@ class User(AbstractBaseUser, PermissionsMixin):
             'Unselect this instead of deleting accounts.'
         ),
     )
+    study = models.CharField(_('study'), max_length=30, blank=True)
     date_joined = models.DateTimeField(_('date joined'), default=timezone.now)
 
     objects = UserManager()
diff --git a/marietje/marietje/templates/registration/login.html b/marietje/marietje/templates/registration/login.html
index 3e9269e..4165e73 100644
--- a/marietje/marietje/templates/registration/login.html
+++ b/marietje/marietje/templates/registration/login.html
@@ -27,7 +27,7 @@
                 </div>
             </div>
             <div class="text-center">
-                <a href="{% url 'register' %}" >Don't have an account? Register</a><br>
+                Don't have an account? Send an email to {{ contact_email }}<br>
                 <a href="{% url 'forgotpassword' %}" >Forgot your password? Reset password</a>
             </div>
         </div>
diff --git a/marietje/marietje/templates/registration/register.html b/marietje/marietje/templates/registration/register.html
index f1e3c0c..94af0d3 100644
--- a/marietje/marietje/templates/registration/register.html
+++ b/marietje/marietje/templates/registration/register.html
@@ -3,37 +3,11 @@
 {% block title %}Register{% endblock %}
 
 {% block content %}
-<form method="POST" action="{% url 'register' %}">
-    {% csrf_token %}
-    <div class="row centered-form">
-        <div class="col-xs-12 col-sm-8 col-md-4 col-sm-offset-2 col-md-offset-4">
-            <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">Register</h3>
-                </div>
-                <div class="panel-body">
-                    <div class="form-group">
-                        <input type="text" name="name" class="form-control input-sm" placeholder="Full Name">
-                    </div>
-
-                    <div class="form-group">
-                        <div class="input-group">
-                            <input name="email" type="text" class="form-control" placeholder="Email Address" aria-describedby="email-postfix">
-                            <span class="input-group-addon" id="email-postfix">@science.ru.nl</span>
-                        </div>
-                    </div>
-
-                    <div class="form-group">
-                        <input type="password" name="password1" class="form-control input-sm" placeholder="Password">
-                    </div>
-
-                    <div class="form-group">
-                        <input type="password" name="password2" class="form-control input-sm" placeholder="Confirm Password">
-                    </div>
-                    <input type="submit" value="Register" class="btn btn-primary btn-block">
-                </div>
-            </div>
-        </div>
+<div class="row centered-form">
+    <div class="col-xs-12 col-sm-10 col-md-8 col-md-offset-2">
+        <center>
+            <strong>Registration by interface is disabled. To register an account, please send an email to {{ contact_email }} with your C&amp;CZ username and the name of your study.</strong>
+        </center>
     </div>
-</form>
+</div>
 {% endblock %}
diff --git a/marietje/marietje/views.py b/marietje/marietje/views.py
index 235ff99..efe0f0f 100644
--- a/marietje/marietje/views.py
+++ b/marietje/marietje/views.py
@@ -13,33 +13,7 @@ from .forms import RegistrationForm, ResetPasswordForm
 
 
 def register(request):
-    if not request.POST:
-        return render(request, 'registration/register.html')
-
-    form = RegistrationForm(request.POST)
-
-    if not form.is_valid():
-        return render(request, 'registration/register.html', {'form': form})
-    user = form.save(commit=False)
-
-    user.username = request.POST.get('email')
-    user.email = user.username + '@science.ru.nl'
-    user.name = request.POST.get('name')
-    user.activation_token = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(32))
-    user.queue = get_first_queue()
-    user.save()
-
-    activation_link = request.build_absolute_uri(reverse('activate', args=[user.id, user.activation_token]))
-
-    send_mail('Marietje - Confirm your account',
-              'Please confirm your account by following this link: ' + activation_link,
-              settings.MAIL_FROM,
-              [user.email],
-              fail_silently=True)
-    messages.add_message(request, messages.INFO, 'Please check your email, ' + user.email + ', for activation.',
-                         extra_tags='info')
-    return redirect('login')
-
+    return render(request, 'registration/register.html')
 
 def activate(request, user_id, token):
     User = get_user_model()