From 0f3587dac9c8fb6bac1bc88fb54db80bcb23fca7 Mon Sep 17 00:00:00 2001 From: Dimas Ciputra Date: Thu, 19 Oct 2023 14:50:50 +0700 Subject: [PATCH] Do not display superuser menu items to staff user (#3538) --- bims/templates/fbis/navigation_bar.html | 20 +++++++++++++++----- bims/templates/navigation_bar.html | 4 +++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/bims/templates/fbis/navigation_bar.html b/bims/templates/fbis/navigation_bar.html index 7a139025b..816fc4211 100644 --- a/bims/templates/fbis/navigation_bar.html +++ b/bims/templates/fbis/navigation_bar.html @@ -92,17 +92,19 @@
{% else %}
  • - {{ request.user.first_name }} + + {% if request.user.first_name %} + {{ request.user.first_name }} + {% else %} + {{ request.user.username }} + {% endif %}
    • - {% if bims_preferences.enable_upload_data %} - Upload Data - {% endif %} - {% if user.is_staff or user.is_superuser %} + {% if user.is_superuser %}
  • Administration @@ -127,6 +129,14 @@
  • Analytics
    • + {% elif user.is_staff %} +
  • + Administration + + +
    • {% endif %} {% if preferences.SiteSetting.default_data_source == 'fbis' %}
  • diff --git a/bims/templates/navigation_bar.html b/bims/templates/navigation_bar.html index a719bad61..5174ba6a9 100644 --- a/bims/templates/navigation_bar.html +++ b/bims/templates/navigation_bar.html @@ -149,7 +149,7 @@ Profile Site Visits
    - {% if user.is_staff or user.is_superuser %} + {% if user.is_superuser %}
    Upload
    Taxonomic Data Occurrence Data @@ -166,6 +166,8 @@ Wagtail Admin Backups Summary Report + {% elif user.is_staff %} + Admin Page {% endif %}
    Log Out