diff --git a/castellum/castellum_auth/fixtures/groups.json b/castellum/castellum_auth/fixtures/groups.json index 2f03370724b2e60ed45e3398f9f4806e591b30cd..bbbe6e54483045fad824a04f3d85624fe4129119 100644 --- a/castellum/castellum_auth/fixtures/groups.json +++ b/castellum/castellum_auth/fixtures/groups.json @@ -5,21 +5,6 @@ "fields": { "name": "Study coordinator", "permissions": [ - [ - "change_subjectfilter", - "recruitment", - "subjectfilter" - ], - [ - "view_subjectfilter", - "recruitment", - "subjectfilter" - ], - [ - "add_study", - "studies", - "study" - ], [ "change_study", "studies", @@ -45,29 +30,9 @@ "name": "Subject manager", "permissions": [ [ - "add_contact", - "contacts", - "contact" - ], - [ - "change_contact", - "contacts", - "contact" - ], - [ - "view_contact", - "contacts", - "contact" - ], - [ - "change_attributeset", - "recruitment", - "attributeset" - ], - [ - "view_attributeset", - "recruitment", - "attributeset" + "view_subject", + "subjects", + "subject" ], [ "change_subject", @@ -84,22 +49,7 @@ "name": "Recruiter", "permissions": [ [ - "view_contact", - "contacts", - "contact" - ], - [ - "add_participation", - "recruitment", - "participation" - ], - [ - "change_participation", - "recruitment", - "participation" - ], - [ - "view_participation", + "recruit", "recruitment", "participation" ] @@ -113,7 +63,7 @@ "name": "Study conductor", "permissions": [ [ - "view_participation_pseudonyms", + "conduct_study", "recruitment", "participation" ] @@ -127,22 +77,12 @@ "name": "Data protection coordinator", "permissions": [ [ - "view_contact", - "contacts", - "contact" - ], - [ - "delete_participation", - "recruitment", - "participation" - ], - [ - "view_participation_pseudonyms", - "recruitment", - "participation" + "view_subject", + "subjects", + "subject" ], [ - "view_subject", + "export_subject", "subjects", "subject" ], @@ -186,9 +126,14 @@ "name": "Receptionist", "permissions": [ [ - "search_execution", + "search_participations", "recruitment", "participation" + ], + [ + "view_current_appointments", + "recruitment", + "appointment" ] ] } diff --git a/castellum/contacts/mixins.py b/castellum/contacts/mixins.py index 59e36ce09fdcc836c80f3a9ae2ea6efdff1c7769..dab5a4243fd4de253cfbf082ff8e3b2eb93afe66 100644 --- a/castellum/contacts/mixins.py +++ b/castellum/contacts/mixins.py @@ -30,7 +30,7 @@ from .models import Contact class BaseContactUpdateView(PermissionRequiredMixin, UpdateView): model = Contact form_class = ContactForm - permission_required = 'contacts.change_contact' + permission_required = 'subjects.change_subject' def get_form_kwargs(self): kwargs = super().get_form_kwargs() diff --git a/castellum/data_protection/templates/data_protection/index.html b/castellum/data_protection/templates/data_protection/index.html index deeab7994c92453906f7e7903b1ed3cc17706de9..ea0d1381f177fee3b866657218938fcfb37ad325 100644 --- a/castellum/data_protection/templates/data_protection/index.html +++ b/castellum/data_protection/templates/data_protection/index.html @@ -1,5 +1,5 @@ {% extends "base_with_breadcrumbs.html" %} -{% load i18n %} +{% load i18n auth %} {% block title %}{% trans 'Data protection dashboard' %} · {{ block.super }}{% endblock %} @@ -11,12 +11,15 @@
{{ study|verbose_name:'contact_person' }}: {{ study.contact_person }}