From 19d000aec786089c6359d86b52dda8481165a741 Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Sun, 4 Oct 2020 16:00:50 -0700
Subject: [PATCH] Show errors in edit user form and remove email

email was triggering the form to reject becuase of uniqueness
---
 bookwyrm/forms.py                 |  2 +-
 bookwyrm/templates/edit_user.html | 18 +++++++++++++-----
 bookwyrm/view_actions.py          |  6 +++++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 7b18a2ff..ee6a5667 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -99,7 +99,7 @@ class EditUserForm(CustomForm):
     class Meta:
         model = models.User
         fields = [
-            'avatar', 'name', 'email', 'summary', 'manually_approves_followers'
+            'avatar', 'name', 'summary', 'manually_approves_followers'
         ]
         help_texts = {f: None for f in fields}
 
diff --git a/bookwyrm/templates/edit_user.html b/bookwyrm/templates/edit_user.html
index df620df4..1d2db706 100644
--- a/bookwyrm/templates/edit_user.html
+++ b/bookwyrm/templates/edit_user.html
@@ -2,24 +2,32 @@
 {% block content %}
 <div class="block columns">
     <div class="column is-half">
+        <h2 class="title">Profile</h2>
+        {% if form.non_field_errors %}
+        <p class="notification is-danger">{{ form.non_field_errors }}</p>
+        {% endif %}
         <form name="edit-profile" action="/edit_profile/" method="post" enctype="multipart/form-data">
             {% csrf_token %}
-            <h2 class="title">Profile</h2>
             <p class="block">
                 <label class="label" for="id_avatar">Avatar:</label>
                 {{ form.avatar }}
+                {% for error in form.avatar.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
             </p>
             <p class="block">
                 <label class="label" for="id_name">Display name:</label>
                 {{ form.name }}
+                {% for error in form.name.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
             </p>
             <p class="block">
                 <label class="label" for="id_summary">Summary:</label>
                 {{ form.summary }}
-            </p>
-            <p class="block">
-                <label class="label" for="id_email">Email address:</label>
-                {{ form.email }}
+                {% for error in form.summary.errors %}
+                <p class="help is-danger">{{ error | escape }}</p>
+                {% endfor %}
             </p>
             <p class="block">
                 <label class="checkbox label" for="id_manually_approve_followers">
diff --git a/bookwyrm/view_actions.py b/bookwyrm/view_actions.py
index 102ec466..7d65bae3 100644
--- a/bookwyrm/view_actions.py
+++ b/bookwyrm/view_actions.py
@@ -173,7 +173,11 @@ def edit_profile(request):
 
     form = forms.EditUserForm(request.POST, request.FILES)
     if not form.is_valid():
-        return redirect('/')
+        data = {
+            'form': form,
+            'user': request.user,
+        }
+        return TemplateResponse(request, 'edit_user.html', data)
 
     request.user.name = form.data['name']
     if 'avatar' in form.files: