From 81e60cea16415f626a6a37ff22d5e8c03ecd39df Mon Sep 17 00:00:00 2001
From: Mouse Reeve <mousereeve@riseup.net>
Date: Mon, 4 Jan 2021 10:48:48 -0800
Subject: [PATCH] Fixes login form

---
 bookwyrm/forms.py              | 2 +-
 bookwyrm/templates/layout.html | 6 +++---
 bookwyrm/templates/login.html  | 4 ++--
 bookwyrm/view_actions.py       | 5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/bookwyrm/forms.py b/bookwyrm/forms.py
index 557cb00b0..152c2d768 100644
--- a/bookwyrm/forms.py
+++ b/bookwyrm/forms.py
@@ -35,7 +35,7 @@ class CustomForm(ModelForm):
 class LoginForm(CustomForm):
     class Meta:
         model = models.User
-        fields = ['username', 'password']
+        fields = ['localname', 'password']
         help_texts = {f: None for f in fields}
         widgets = {
             'password': PasswordInput(),
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index 2e8fdcac9..a25658400 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -119,15 +119,15 @@
             </div>
             {% else %}
             <div class="navbar-item">
-                {% if request.path != '/login' and request.path != '/login/' %}
+                {% if request.path != '/login' and request.path != '/login/' and request.path != '/user-login' %}
                 <div class="columns">
                     <div class="column">
                         <form name="login" method="post" action="/user-login">
                             {% csrf_token %}
                             <div class="field is-grouped">
                                 <div class="control">
-                                    <label class="is-sr-only" for="id_username">Username:</label>
-                                    <input type="text" name="username" maxlength="150" class="input" required="" id="id_username" placeholder="username">
+                                    <label class="is-sr-only" for="id_localname">Username:</label>
+                                    <input type="text" name="localname" maxlength="150" class="input" required="" id="id_localname" placeholder="username">
                                 </div>
                                 <div class="control">
                                     <label class="is-sr-only" for="id_password">Username:</label>
diff --git a/bookwyrm/templates/login.html b/bookwyrm/templates/login.html
index ce5d9e41c..40d57fa42 100644
--- a/bookwyrm/templates/login.html
+++ b/bookwyrm/templates/login.html
@@ -11,9 +11,9 @@
             <form name="login" method="post" action="/user-login">
                 {% csrf_token %}
                 <div class="field">
-                    <label class="label" for="id_username">Username:</label>
+                    <label class="label" for="id_localname">Username:</label>
                     <div class="control">
-                        {{ login_form.username }}
+                        {{ login_form.localname }}
                     </div>
                 </div>
                 <div class="field">
diff --git a/bookwyrm/view_actions.py b/bookwyrm/view_actions.py
index 965478f41..c600248a7 100644
--- a/bookwyrm/view_actions.py
+++ b/bookwyrm/view_actions.py
@@ -30,8 +30,9 @@ def user_login(request):
     ''' authenticate user login '''
     login_form = forms.LoginForm(request.POST)
 
-    username = login_form.data['username']
-    username = '%s@%s' % (username, DOMAIN)
+    print(login_form.data)
+    localname = login_form.data['localname']
+    username = '%s@%s' % (localname, DOMAIN)
     password = login_form.data['password']
     user = authenticate(request, username=username, password=password)
     if user is not None: