Merge branch 'master' into 160-versioning-of-models

aleksis/core/templates/two_factor/core/login.html

@@ -9,29 +9,38 @@
 {% block content %}
   <h4>{% trans "Login" %}</h4>
 
-  <div class="alert primary">
-    <p>
-      <i class="material-icons left">info</i>
+  {% if wizard.steps.current == "auth" and user.is_authenticated %}
+    <div class="alert warning">
+      <p>
+        <i class="material-icons left">warning</i>
+        {% blocktrans %}You have no permission to view this page. Please login with an other account.{% endblocktrans %}
+      </p>
+    </div>
+  {% else %}
+    <div class="alert primary">
+      <p>
+        <i class="material-icons left">info</i>
 
-      {% if wizard.steps.current == 'auth' %}
-        {% blocktrans %}Enter your credentials.{% endblocktrans %}
-      {% elif wizard.steps.current == 'token' %}
-        {% if device.method == 'call' %}
-          {% blocktrans %}We are calling your phone right now, please enter the
-            digits you hear.{% endblocktrans %}
-        {% elif device.method == 'sms' %}
-          {% blocktrans %}We sent you a text message, please enter the tokens we
-            sent.{% endblocktrans %}
-        {% else %}
-          {% blocktrans %}Please enter the tokens generated by your token
-            generator.{% endblocktrans %}
+        {% if wizard.steps.current == 'auth' %}
+          {% blocktrans %}Please login to see this page.{% endblocktrans %}
+        {% elif wizard.steps.current == 'token' %}
+          {% if device.method == 'call' %}
+            {% blocktrans %}We are calling your phone right now, please enter the
+              digits you hear.{% endblocktrans %}
+          {% elif device.method == 'sms' %}
+            {% blocktrans %}We sent you a text message, please enter the tokens we
+              sent.{% endblocktrans %}
+          {% else %}
+            {% blocktrans %}Please enter the tokens generated by your token
+              generator.{% endblocktrans %}
+          {% endif %}
+        {% elif wizard.steps.current == 'backup' %}
+          {% blocktrans %}Use this form for entering backup tokens for logging in.
+            These tokens have been generated for you to print and keep safe. Please
+            enter one of these backup tokens to login to your account.{% endblocktrans %}
         {% endif %}
-      {% elif wizard.steps.current == 'backup' %}
-        {% blocktrans %}Use this form for entering backup tokens for logging in.
-          These tokens have been generated for you to print and keep safe. Please
-          enter one of these backup tokens to login to your account.{% endblocktrans %}
-      {% endif %}
-  </div>
+    </div>
+  {% endif %}
 
 
   <form action="" method="post">

tox.ini

@@ -7,9 +7,12 @@ envlist = py37,py38
 whitelist_externals = poetry
 skip_install = true
 envdir = {toxworkdir}/globalenv
-commands_pre = ./dev.sh install-all
+commands_pre =
+     - sudo apt update
+     - sudo apt install python3-ldap libldap2-dev libssl-dev libsasl2-dev python3.7-dev -y
+     - ./dev.sh install-all
 commands =
-    poetry run pytest --cov=. {posargs} aleksis/ apps/official/
+    - poetry run pytest --cov=. {posargs} aleksis/ apps/official/
 
 [testenv:selenium]
 setenv =