diff --git a/ietf/ietfauth/utils.py b/ietf/ietfauth/utils.py index 0680762e2..98749c21d 100644 --- a/ietf/ietfauth/utils.py +++ b/ietf/ietfauth/utils.py @@ -69,13 +69,14 @@ def has_role(user, role_names, *args, **kwargs): "Nomcom": Q(person=person, group__type="nomcom", group__acronym__icontains=kwargs.get('year', '0000')), "Liaison Manager": Q(person=person,name="liaiman",group__type="sdo",group__state="active", ), "Authorized Individual": Q(person=person,name="auth",group__type="sdo",group__state="active", ), + "Reviewer": Q(person=person, name="reviewer", group__state="active"), } filter_expr = Q() for r in role_names: filter_expr |= role_qs[r] - user.roles_check_cache[key] = bool(Role.objects.filter(filter_expr)[:1]) + user.roles_check_cache[key] = bool(Role.objects.filter(filter_expr).exists()) return user.roles_check_cache[key] diff --git a/ietf/templates/base/menu_user.html b/ietf/templates/base/menu_user.html index 106f74ec7..0814c517d 100644 --- a/ietf/templates/base/menu_user.html +++ b/ietf/templates/base/menu_user.html @@ -25,6 +25,10 @@
  • {% if request.user.is_authenticated %}Manage account{% else %}New account{% endif %}
  • Preferences
  • + {% if user|has_role:"Reviewer" %} +
  • My reviews
  • + {% endif %} + {% if user|has_role:"Area Director" %} {% if flavor == "top" %}{% endif %}
  • AD dashboard
  • diff --git a/ietf/templates/ietfauth/review_overview.html b/ietf/templates/ietfauth/review_overview.html index b68758ef3..d91d8e6d4 100644 --- a/ietf/templates/ietfauth/review_overview.html +++ b/ietf/templates/ietfauth/review_overview.html @@ -46,7 +46,7 @@ {% endif %} -

    Latest closed requests

    +

    Latest closed review requests

    {% if closed_review_requests %} @@ -77,7 +77,7 @@
    {% else %} -

    Did not find any closed requests assigned to you.

    +

    Did not find any closed review requests assigned to you.

    {% endif %} @@ -134,7 +134,7 @@ Filter regexp - {{ t.reviewer_settings.filter_re|default:"(None)" }} + {{ t.reviewer_settings.filter_re|default:"(None)" }} Unavailable periods