Merge branch 'master' into email_from_uniqueness

app/main/views/manage_users.py

@@ -60,7 +60,9 @@ def invite_user(service_id):
         # view_activity is a default role to be added to all users.
         # All users will have at minimum view_activity to allow users to see notifications,
         # templates, team members but no update privileges
-        permissions = ','.join(role for role in roles.keys() if request.form.get(role) == 'y').join('view_activity')
+        selected_permissions = [role for role in sorted(roles.keys()) if request.form.get(role) == 'y']
+        selected_permissions.append('view_activity')
+        permissions = ','.join(selected_permissions)
         invited_user = invite_api_client.create_invite(
             current_user.id,
             service_id,

app/templates/admin_template.html

@@ -79,7 +79,11 @@
         </div>
         <div class="column-one-third">
           <h2>About</h2>
-          <a href="{{ url_for("main.help") }}">Help</a>
+          <ul>
+            <li><a href="{{ url_for("main.help") }}">Help</a></li>
+            <li><a href="{{ url_for("main.terms") }}">Terms of use</a></li>
+            <li><a href="{{ url_for("main.cookies") }}">Cookies</a></li>
+          </ul>
         </div>
         <div class="column-one-third">
           <h2>Developers</h2>
@@ -92,8 +96,6 @@
 
 {% block footer_support_links %}
   <nav class="footer-nav">
-    <a href="{{ url_for("main.terms") }}">Terms of use</a>
-    <a href="{{ url_for("main.cookies") }}">Cookies</a>
     Built by the <a href="https://www.gov.uk/government/organisations/government-digital-service">Government Digital Service</a>
   </nav>
 {% endblock %}