Merge pull request #616 from dbca-wa/v2.1.0prod

Fix group filter issue
dbca-wa · Oct 24, 2024 · dae5e60 · dae5e60
2 parents 2c0014d + 83e9c48
commit dae5e60
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/marine_mammal_incidents/templates/marine_mammal_incidents/incident_list.html b/marine_mammal_incidents/templates/marine_mammal_incidents/incident_list.html
@@ -2,7 +2,7 @@
 {% load static bootstrap4 %}
 {% load proper_paginate %}
 {% load url_replace %}
-{% load group_filters %}
+{% load mmi_group_filters %}
 
 {% block extra_style %}
     {{ block.super }}
@@ -146,7 +146,9 @@ <h1 class="incident-title">Marine Mammal Incidents</h1>
                             <th>Species</th>
                             <th>Location</th>
                             <th>Type</th>
+                            {% if request.user|mmi_has_group:"data curator" or request.user.is_superuser or request.user|mmi_has_group:"MARINE_ANIMAL_INCIDENTS"%}
                             <th>Actions</th>
+                            {% endif %}
                         </tr>
                     </thead>
                     <tbody>
@@ -156,9 +158,11 @@ <h1 class="incident-title">Marine Mammal Incidents</h1>
                             <td>{{ incident.species }}</td>
                             <td>{{ incident.location_name }}</td>
                             <td>{{ incident.get_incident_type_display }}</td>
+                            {% if request.user|mmi_has_group:"data curator" or request.user.is_superuser or request.user|mmi_has_group:"MARINE_ANIMAL_INCIDENTS"%}
                             <td>
                                 <a href="{% url 'marine_mammal_incidents:update_incident' incident.id %}" class="btn btn-sm btn-primary">View / Update</a>
                             </td>
+                            {% endif %}
                         </tr>
                     {% empty %}
                         <tr><td colspan="5">No incidents recorded yet.</td></tr>

diff --git a/marine_mammal_incidents/templatetags/__init__.py b/marine_mammal_incidents/templatetags/__init__.py
diff --git a/...l_incidents/templatetags/group_filters.py → ...cidents/templatetags/mmi_group_filters.py b/...l_incidents/templatetags/group_filters.py → ...cidents/templatetags/mmi_group_filters.py
diff --git a/marine_mammal_incidents/views.py b/marine_mammal_incidents/views.py
@@ -15,7 +15,7 @@
 from django.core.exceptions import PermissionDenied
 
 def user_in_marine_animal_incidents_group(user):
-    return user.is_superuser or user.groups.filter(name='MARINE_ANIMAL_INCIDENTS').exists()
+    return user.is_superuser or user.groups.filter(name='MARINE_ANIMAL_INCIDENTS') or user.groups.filter(name='data curator').exists()
 
 @user_passes_test(user_in_marine_animal_incidents_group, login_url=None, redirect_field_name=None)
 def incident_form(request, pk=None):

diff --git a/wamtram2/templatetags/__init__.py b/wamtram2/templatetags/__init__.py