From b04ff47e04d0d46783f0e26e8ae111aa50dd0be0 Mon Sep 17 00:00:00 2001 From: Jacob Olson Date: Mon, 9 Nov 2026 20:28:26 -0700 Subject: [PATCH] Fix blank Permissions pages: extend the real layout The permission list, grant and bulk-grant templates extended base/base.html, which has no content block, so everything in them was discarded and the page was empty. Move them onto layout.html in the app's own style, add the missing revoke confirmation page and a Revoke action, and describe each permission's target safely so a deleted item or removed model cannot break the list. Co-Authored-By: Claude Sonnet 5.5 --- krill/person/tests/test_permission_list.py | 77 ++++++++++ krill/person/views.py | 17 ++ .../person/bulk_permission_form.html | 47 ++++-- .../person/permission_confirm_delete.html | 21 +++ krill/templates/person/permission_form.html | 47 ++++-- krill/templates/person/permission_list.html | 145 ++++++++++-------- 6 files changed, 257 insertions(+), 97 deletions(-) create mode 100644 krill/person/tests/test_permission_list.py create mode 100644 krill/templates/person/permission_confirm_delete.html diff --git a/krill/person/tests/test_permission_list.py b/krill/person/tests/test_permission_list.py new file mode 100644 index 0000000..9863826 --- /dev/null +++ b/krill/person/tests/test_permission_list.py @@ -0,0 +1,77 @@ +from django.contrib.auth import get_user_model +from django.contrib.contenttypes.models import ContentType +from django.test import TestCase +from django.urls import reverse + +from person.models import Permission +from sample.models.sample import Sample +from sample.models.source import Source + +User = get_user_model() + + +class PermissionListTest(TestCase): + """The list must load even when a permission points at something that no longer exists.""" + + def setUp(self): + self.admin = User.objects.create_user(username='admin2', password='x') + self.admin.role.role = 'lab_admin' + self.admin.role.save() + self.member = User.objects.create_user(username='member', password='x') + self.client.force_login(self.admin) + + def grant(self, content_type, object_id): + return Permission.objects.create(user=self.member, permission_type='view', content_type=content_type, + object_id=object_id, granted_by=self.admin) + + def page(self): + response = self.client.get(reverse('person:permission_list')) + self.assertEqual(response.status_code, 200) + return response + + def test_lists_a_permission_on_an_existing_object(self): + sample = Sample.objects.create(name='MM134', source=Source.objects.create(name='Lab')) + self.grant(ContentType.objects.get_for_model(Sample), sample.pk) + page = self.page() + self.assertContains(page, 'Sample: MM134') + self.assertContains(page, 'member') + self.assertContains(page, 'Grant Permission') # the page body is actually rendered + + def test_a_permission_on_a_deleted_object_still_loads(self): + self.grant(ContentType.objects.get_for_model(Sample), 999999) + self.assertContains(self.page(), 'Sample #999999 (no longer exists)') + + def test_a_permission_on_a_model_that_was_removed_still_loads(self): + stale = ContentType.objects.create(app_label='sample', model='aliquottube') # class no longer exists + self.grant(stale, 1) + self.assertContains(self.page(), 'this kind of item no longer exists') + + def test_empty_list_says_so(self): + self.assertContains(self.page(), 'No permissions have been granted.') + + def test_grant_bulk_and_revoke_pages_render_inside_the_layout(self): + permission = self.grant(ContentType.objects.get_for_model(Sample), 999999) + for name, args, expected in ( + ('person:grant_permission', [], 'Give a user access to one specific item.'), + ('person:bulk_grant_permission', [], 'Give several users access'), + ('person:revoke_permission', [permission.id], 'Remove view access from member'), + ): + response = self.client.get(reverse(name, args=args)) + self.assertEqual(response.status_code, 200, name) + self.assertContains(response, expected) + self.assertContains(response, 'class="sidebar"') # inside the normal layout, with the menu + + def test_revoking_removes_the_permission(self): + permission = self.grant(ContentType.objects.get_for_model(Sample), 1) + response = self.client.post(reverse('person:revoke_permission', args=[permission.id])) + self.assertRedirects(response, reverse('person:permission_list')) + self.assertFalse(Permission.objects.filter(pk=permission.pk).exists()) + + def test_grant_form_creates_a_permission(self): + sample = Sample.objects.create(name='MM134', source=Source.objects.create(name='Lab')) + response = self.client.post(reverse('person:grant_permission'), { + 'user': self.member.pk, 'permission_type': 'view', + 'content_type': ContentType.objects.get_for_model(Sample).pk, 'object_id': sample.pk, + }) + self.assertRedirects(response, reverse('person:permission_list')) + self.assertEqual(Permission.objects.get().object_id, sample.pk) diff --git a/krill/person/views.py b/krill/person/views.py index 0292c99..e8ee7ce 100644 --- a/krill/person/views.py +++ b/krill/person/views.py @@ -1209,6 +1209,21 @@ def user_role_edit(request, user_id): return render(request, 'person/user_role_edit.html', context) +def describe_permission_target(permission): + """What a permission is for, in words. Never raises: the item may have been deleted, or its + model removed from Krill, and the page must still load.""" + content_type = permission.content_type + model = content_type.model_class() + kind = (model._meta.verbose_name if model else content_type.model).title() + if model is None: + return f"{kind} #{permission.object_id} (this kind of item no longer exists)" + try: + item = model._default_manager.get(pk=permission.object_id) + except model.DoesNotExist: + return f"{kind} #{permission.object_id} (no longer exists)" + return f"{kind}: {item}" + + @login_required @require_minimum_role('lab_manager') def permission_list(request): @@ -1230,6 +1245,7 @@ def permission_list(request): page_obj = paginator.get_page(page_number) context = { 'page_obj': page_obj, + 'rows': [{'permission': p, 'target': describe_permission_target(p)} for p in page_obj], 'total_permissions': permissions.count(), } return render(request, 'person/permission_list.html', context) @@ -1266,6 +1282,7 @@ def revoke_permission(request, permission_id): return redirect('person:permission_list') context = { 'permission': permission, + 'target': describe_permission_target(permission), } return render(request, 'person/permission_confirm_delete.html', context) diff --git a/krill/templates/person/bulk_permission_form.html b/krill/templates/person/bulk_permission_form.html index 3e56414..0a8813e 100644 --- a/krill/templates/person/bulk_permission_form.html +++ b/krill/templates/person/bulk_permission_form.html @@ -1,25 +1,40 @@ -{% extends 'base/base.html' %} +{% extends 'base/layout.html' %} -{% block title %}Bulk Grant Permissions{% endblock %} +{% block title %}Bulk Grant Permissions - Krill{% endblock %} {% block content %} -
-
-
-
-
-

Bulk Grant Permissions

+
+
+

Bulk Grant Permissions

+

Give several users access to one specific item at once.

+
+
+
+ {% csrf_token %} +
+ {% if form.non_field_errors %} +
+ {% for error in form.non_field_errors %}{{ error }}{% endfor %}
-
- - {% csrf_token %} - {{ form.as_p }} - - Cancel - + {% endif %} + {% for field in form %} +
+ + {{ field }} + {% if field.help_text %}{{ field.help_text }}{% endif %} + {% if field.errors %} +
+ {% for error in field.errors %}{{ error }}{% endfor %} +
+ {% endif %}
+ {% endfor %} +
+
+ + Cancel
-
+
{% endblock %} diff --git a/krill/templates/person/permission_confirm_delete.html b/krill/templates/person/permission_confirm_delete.html new file mode 100644 index 0000000..876fff7 --- /dev/null +++ b/krill/templates/person/permission_confirm_delete.html @@ -0,0 +1,21 @@ +{% extends 'base/layout.html' %} + +{% block title %}Revoke Permission - Krill{% endblock %} + +{% block content %} +
+
+

Revoke Permission

+

Remove {{ permission.get_permission_type_display|lower }} access from {{ permission.user.username }} to {{ target }}?

+
+
+
+ {% csrf_token %} +
+ + Cancel +
+
+
+
+{% endblock %} diff --git a/krill/templates/person/permission_form.html b/krill/templates/person/permission_form.html index eac66d4..b2f9622 100644 --- a/krill/templates/person/permission_form.html +++ b/krill/templates/person/permission_form.html @@ -1,25 +1,40 @@ -{% extends 'base/base.html' %} +{% extends 'base/layout.html' %} -{% block title %}Grant Permission{% endblock %} +{% block title %}Grant Permission - Krill{% endblock %} {% block content %} -
-
-
-
-
-

Grant Permission

+
+
+

Grant Permission

+

Give a user access to one specific item.

+
+
+
+ {% csrf_token %} +
+ {% if form.non_field_errors %} +
+ {% for error in form.non_field_errors %}{{ error }}{% endfor %}
-
- - {% csrf_token %} - {{ form.as_p }} - - Cancel - + {% endif %} + {% for field in form %} +
+ + {{ field }} + {% if field.help_text %}{{ field.help_text }}{% endif %} + {% if field.errors %} +
+ {% for error in field.errors %}{{ error }}{% endfor %} +
+ {% endif %}
+ {% endfor %} +
+
+ + Cancel
-
+
{% endblock %} diff --git a/krill/templates/person/permission_list.html b/krill/templates/person/permission_list.html index eb5d45b..2e6321b 100644 --- a/krill/templates/person/permission_list.html +++ b/krill/templates/person/permission_list.html @@ -1,74 +1,89 @@ -{% extends 'base/base.html' %} +{% extends 'base/layout.html' %} -{% block title %}Permissions{% endblock %} +{% block title %}Permissions - Krill{% endblock %} {% block content %} -
-
-
-
-
-

Permissions

- -
-
-
- - - - - - - - - - - - - {% for permission in page_obj %} - - - - - - - - - {% empty %} - - - - {% endfor %} - -
UserPermission TypeObjectGranted ByGranted AtExpires At
{{ permission.user.username }}{{ permission.get_permission_type_display }}{{ permission.content_object }}{{ permission.granted_by.username|default:"-" }}{{ permission.granted_at|date:"M d, Y H:i" }}{{ permission.expires_at|date:"M d, Y H:i"|default:"Never" }}
No permissions found.
-
- {% if page_obj.has_other_pages %} - +
+
+

Permissions

+

Access granted to individual users for specific items

+
+
+ + +
+ + + + + + + + + + + + + + {% for row in rows %} + + + + + + + + + + {% empty %} + + {% endfor %} + +
UserPermissionItemGranted byGrantedExpiresActions
{{ row.permission.user.username }}{{ row.permission.get_permission_type_display }}{{ row.target }}{{ row.permission.granted_by.username|default:"-" }}{{ row.permission.granted_at|date:"M j, Y" }}{% if row.permission.expires_at %}{{ row.permission.expires_at|date:"M j, Y H:i" }}{% else %}Never{% endif %} + +
No permissions have been granted.
+
+ + {% if page_obj.has_other_pages %} +
+ + {% endfor %} + {% if page_obj.has_next %} + + chevron_right + + {% endif %}
+ {% endif %} + +
+ {{ total_permissions }} permission{{ total_permissions|pluralize }} +
{% endblock %}