From 39ee687bfa6709b23ae969700230cc40adbd718c Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 14 Nov 2024 17:51:18 +0100 Subject: 🗃️ rename permission request fields to permission queries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/admin.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'ishtar_common/admin.py') diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 7a621f601..2e85486cf 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -783,9 +783,9 @@ class PersonAdmin(HistorizedObjectAdmin): admin_site.register(models.Person, PersonAdmin) -class PermissionRequestAdminForm(forms.ModelForm): +class PermissionQueryAdminForm(forms.ModelForm): class Meta: - model = models_common.PermissionRequest + model = models_common.PermissionQuery exclude = [] def __init__(self, *args, **kwargs): @@ -825,15 +825,15 @@ class PermissionRequestAdminForm(forms.ModelForm): return self.cleaned_data -@admin.register(models_common.PermissionRequest, site=admin_site) -class PermissionRequestAdmin(admin.ModelAdmin): +@admin.register(models_common.PermissionQuery, site=admin_site) +class PermissionQueryAdmin(admin.ModelAdmin): prepopulated_fields = {"slug": ("name",)} search_fields = ("model__model__unaccent", "name") list_display = ( "model", "name", "active", "include_associated_items", "include_upstream_items", "limit_to_attached_areas" ) - form = PermissionRequestAdminForm + form = PermissionQueryAdminForm def get_content_types_with_sheet(with_empty=False): @@ -1825,7 +1825,7 @@ admin_site.register(models.Area, AreaAdmin) class ProfileTypeAdmin(GeneralTypeAdmin): model = models.ProfileType filter_vertical = ("groups",) - autocomplete_fields = ("permission_requests", "filtered_sheets") + autocomplete_fields = ("permission_queries", "filtered_sheets") def save_related(self, request, form, formsets, change): super().save_related(request, form, formsets, change) @@ -1851,8 +1851,8 @@ class ProfileTypeAdmin(GeneralTypeAdmin): permissions_needed.add(perm_type) else: permissions_not_needed.add(perm_type) - for permission_request in obj.permission_requests.all(): - model = permission_request.model.model + for permission_query in obj.permission_queries.all(): + model = permission_query.model.model for perm_type, perm_model in list(permissions_needed): if model == perm_model: permissions_needed.remove((perm_type, perm_model)) -- cgit v1.2.3