diff --git a/src/authentic2/manager/templates/authentic2/manager/user_detail.html b/src/authentic2/manager/templates/authentic2/manager/user_detail.html
index caa710fa2..b3b7a0396 100644
--- a/src/authentic2/manager/templates/authentic2/manager/user_detail.html
+++ b/src/authentic2/manager/templates/authentic2/manager/user_detail.html
@@ -4,6 +4,8 @@
{% block appbar %}
{{ block.super }}
+
+
{% if view.can_delete %}
{% trans "Delete" %}
{% else %}
@@ -16,9 +18,11 @@
{% trans "Edit" %}
{% endif %}
- {% if view.is_oidc_services %}
- {% trans "Authorizations" %}
- {% endif %}
+
{% endblock %}
@@ -75,7 +79,7 @@
{% for ou, ou_roles in roles_by_ou.items %}
{% if have_roles_on_multiple_ou %}
- - {% if ou %}{{ ou }}{% else %}{% trans "All organizational units" %}{% endif %}
+
- {% if ou %}{{ ou }}{% else %}{% trans "All organizational units" %}{% endif %}
{% endif %}
{% for role in ou_roles %}
diff --git a/tests/test_user_manager.py b/tests/test_user_manager.py
index 981c12bc0..856a5c9dc 100644
--- a/tests/test_user_manager.py
+++ b/tests/test_user_manager.py
@@ -852,7 +852,8 @@ def test_manager_user_authorizations(app, superuser, simple_user):
resp = login(app, superuser)
resp = app.get(user_detail_url, status=200)
- assert not resp.html.find('div', {'id': 'appbar'}).find_all('a', {'href': user_authorizations_url})
+ assert user_authorizations_url not in [
+ x['href'] for x in resp.html.find('ul', {'class': 'extra-actions-menu'}).find_all('a')]
# add a service consent to simple_user
oidc_client = OIDCClient.objects.create(
@@ -862,7 +863,8 @@ def test_manager_user_authorizations(app, superuser, simple_user):
redirect_uris='https://example.com/')
resp = app.get(user_detail_url, status=200)
- assert resp.html.find('div', {'id': 'appbar'}).find_all('a', {'href': user_authorizations_url})
+ assert user_authorizations_url in [
+ x['href'] for x in resp.html.find('ul', {'class': 'extra-actions-menu'}).find_all('a')]
auth = OIDCAuthorization.objects.create(
client=oidc_client, user=simple_user, scopes='openid',
@@ -902,8 +904,9 @@ def test_manager_user_authorizations(app, superuser, simple_user):
# user2 can see auth authorizations
resp = login(app, user2)
resp = app.get(user_detail_url, status=200)
- assert resp.html.find('div', {'id': 'appbar'}).find_all('a', {'href': user_authorizations_url})
- resp = resp.click('Authorizations')
+ assert user_authorizations_url in [
+ x['href'] for x in resp.html.find('ul', {'class': 'extra-actions-menu'}).find_all('a')]
+ resp = resp.click('Consents')
assert resp.html.find('h2').text == 'Consent Management'
assert resp.html.find('td', {'class': 'remove-icon-column'}).a['class'] == ['disabled']
# cannot click it's JS :/
@@ -915,8 +918,10 @@ def test_manager_user_authorizations(app, superuser, simple_user):
# user3 can remove auth authorizations
resp = login(app, user3)
resp = app.get(user_detail_url, status=200)
- assert resp.html.find('div', {'id': 'appbar'}).find_all('a', {'href': user_authorizations_url})
- resp = resp.click('Authorizations')
+ assert user_authorizations_url in [
+ x['href'] for x in resp.html.find('ul', {'class': 'extra-actions-menu'}).find_all('a')]
+ resp = resp.click('Consents')
+ resp = app.get(user_authorizations_url, status=200)
assert resp.html.find('h2').text == 'Consent Management'
assert resp.html.find('td', {'class': 'remove-icon-column'}).a['class'] == ['js-remove-object']
# cannot click it's JS :/