Merge #2091

2091: Make webmail the default login action r=mergify[bot] a=nextgens

## What type of PR?

enhancement

## What does this PR do?

Make login to webmail the default action; this was discussed on #mailu-dev and is probably not a bad idea

Co-authored-by: Florent Daigniere <nextgens@freenetproject.org>

core/admin/mailu/sso/forms.py

@@ -7,5 +7,5 @@ class LoginForm(flask_wtf.FlaskForm):
         csrf = False
     email = fields.StringField(_('E-mail'), [validators.Email(), validators.DataRequired()])
     pw = fields.PasswordField(_('Password'), [validators.DataRequired()])
-    submitAdmin = fields.SubmitField(_('Sign in'))
     submitWebmail = fields.SubmitField(_('Sign in'))
+    submitAdmin = fields.SubmitField(_('Sign in'))

core/admin/mailu/sso/views/base.py

@@ -15,10 +15,10 @@ def login():
     form.submitWebmail.label.text = form.submitWebmail.label.text + ' Webmail'
 
     fields = []
-    if str(app.config["ADMIN"]).upper() != "FALSE":
-        fields.append(form.submitAdmin)
     if str(app.config["WEBMAIL"]).upper() != "NONE":
         fields.append(form.submitWebmail)
+    if str(app.config["ADMIN"]).upper() != "FALSE":
+        fields.append(form.submitAdmin)
     fields = [fields]
 
     if form.validate_on_submit():