Skip to content
This repository was archived by the owner on Jun 24, 2024. It is now read-only.

[YC-1206] fix error on ftsearch #1004

Merged
merged 3 commits into from
May 28, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions geocity/apps/submissions/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,11 @@ class ComplementaryDocumentTypeAdmin(IntegratorFilterMixin, admin.ModelAdmin):
ComplementaryDocumentTypeInline,
]
form = ComplementaryDocumentTypeAdminForm
fields = ["name", "form", "integrator"]
fields = [
"name",
"form",
"integrator",
]

def get_list_display(self, request):
if request.user.is_superuser:
Expand All @@ -258,29 +262,39 @@ def get_list_display(self, request):
return list_display

# Fields used in search_fields and list_filter
integrator_fields = [
superadmin_search_fields = [
"name",
"form__name",
"integrator__name",
]
integrator_search_fields = [
"name",
"form__name",
]

superadmin_list_search_fields = [
"name",
"form",
"integrator",
"form__administrative_entities",
]
user_fields = [

integrator_list_search_fields = [
"name",
"form",
]

def get_search_fields(self, request):
if request.user.is_superuser:
search_fields = self.integrator_fields
search_fields = self.superadmin_search_fields
else:
search_fields = self.user_fields
search_fields = self.integrator_search_fields
return search_fields

def get_list_filter(self, request):
if request.user.is_superuser:
list_filter = self.integrator_fields
list_filter = self.superadmin_list_search_fields
else:
list_filter = self.user_fields
list_filter = self.integrator_list_search_fields
return list_filter

# List types of documents
Expand Down
Loading