(#90) - Error message now shows for incorrect password on deletion at…

…tempt

settings/templates/settings/delete.html

@@ -15,14 +15,8 @@ <h1> Delete Your Account </h1>
     <form id="email-form" action="{% url 'settings:delete-acc' %}" method="post">
         {% csrf_token %}
         <div id="form-fields">
-            {# Only render general error message if no field-specific ones exist #}
-            {% if form.errors|length == form.non_field_errors|length %}
-                {% for err in form.non_field_errors %}
-                    <div class="form-error-message">
-                        {{ err }}
-                    </div>
-                {% endfor %}
-                <br/>
+            {% if error %}
+                <p class="error-message"> {{ error }} </p>
             {% endif %}
             {% for field in form %}
                 <div class="error-message"> {{ field.errors }} </div>

settings/views.py

@@ -63,11 +63,22 @@ def delete(request):
 
     if request.method == 'POST':
         form = DeleteForm(request.POST)
-        return HttpResponseRedirect(reverse('access:signup'))
+        if form.is_valid():
+            # Still need to validate correct password
+            user = CustomUser.objects.get(pk=request.user.id)
+            if user.check_password(form.cleaned_data['password']):
+                user.delete()
+                return HttpResponseRedirect(reverse('access:signup'))
+
+            context['error'] = 'Incorrect password!'
+
+        context['form'] = DeleteForm()
+        return render(request, 'settings/delete.html', context)
 
     context['form'] = DeleteForm()
     return render(request, 'settings/delete.html', context)
 
+
 @login_required
 def privacy(request):
     pass