diff options
Diffstat (limited to 'ishtar_common/models.py')
| -rw-r--r-- | ishtar_common/models.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 12dbf9069..4f500db60 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2246,6 +2246,7 @@ class Organization(Address, Merge, OwnPerms, ValueGetter): 'name': 'name__icontains', 'organization_type': 'organization_type__pk__in', } + BASE_SEARCH_VECTORS = ['name', 'town__name'] # fields name = models.CharField(_(u"Name"), max_length=500) @@ -2332,6 +2333,8 @@ class Person(Address, Merge, OwnPerms, ValueGetter): 'attached_to__name', 'town') SHOW_URL = 'show-person' MODIFY_URL = 'person_modify' + BASE_SEARCH_VECTORS = ['name', 'surname', 'raw_name', 'town__name', + 'attached_to__name', 'email'] # search parameters REVERSED_BOOL_FIELDS = ['ishtaruser__isnull'] @@ -2339,6 +2342,7 @@ class Person(Address, Merge, OwnPerms, ValueGetter): 'name': ['name__icontains', 'raw_name__icontains'], 'surname': ['surname__icontains', 'raw_name__icontains'], 'attached_to': 'attached_to__pk', + 'attached_to__name': 'attached_to__name', 'person_types': 'person_types__pk__in', 'ishtaruser__isnull': 'ishtaruser__isnull' } @@ -2545,10 +2549,13 @@ class Person(Address, Merge, OwnPerms, ValueGetter): =user.ishtaruser) -class IshtarUser(models.Model): +class IshtarUser(FullSearch): TABLE_COLS = ('username', 'person__name', 'person__surname', 'person__email', 'person__person_types_list', 'person__attached_to') + BASE_SEARCH_VECTORS = [ + 'username', 'person__name', 'person__surname', 'person__email', + 'person__town__name', 'person__attached_to__name'] # search parameters EXTRA_REQUEST_KEYS = { @@ -2559,6 +2566,7 @@ class IshtarUser(models.Model): 'email': ['person__email'], 'attached_to': 'person__attached_to__pk', 'person_types': 'person__person_types__pk__in', + 'person__person_types_list': 'person__person_types__name' } # fields |