From b9cfeb35957ae9dfca1d39de1e86547074b483be Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 27 Sep 2022 11:09:04 +0200 Subject: Organization: add columns to table - add town search criteria (refs #5447) --- ishtar_common/models.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index a133afead..470ea4e72 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2315,16 +2315,19 @@ organization_type_pks_lazy = lazy(OrganizationType.get_or_create_pks, str) class Organization(Address, Merge, OwnPerms, BaseGenderedType, ValueGetter, MainItem): - TABLE_COLS = ("name", "organization_type", "town") + TABLE_COLS = ("name", "organization_type", "address", "town", "precise_town") SLUG = "organization" SHOW_URL = "show-organization" DELETE_URL = "delete-organization" # search parameters - EXTRA_REQUEST_KEYS = {} + EXTRA_REQUEST_KEYS = { + "precise_town": "precise_town__cached_label" + } BASE_SEARCH_VECTORS = [ SearchVectorConfig("name"), SearchVectorConfig("town"), + SearchVectorConfig("precise_town__name"), ] # alternative names of fields for searches @@ -2336,6 +2339,10 @@ class Organization(Address, Merge, OwnPerms, BaseGenderedType, ValueGetter, Main pgettext_lazy("key for text search", "type"), "organization_type__label__iexact", ), + "precise_town": SearchAltName( + pgettext_lazy("key for text search", "town"), + "precise_town__cached_label__iexact", + ), } QA_EDIT = QuickAction( url="organization-qa-bulk-update", -- cgit v1.2.3