diff options
| -rw-r--r-- | archaeological_finds/models_finds.py | 3 | ||||
| -rw-r--r-- | ishtar_common/models.py | 14 |
2 files changed, 15 insertions, 2 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 2d78b883e..76d5fb97a 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -689,6 +689,9 @@ class FindBasket(Basket, MainItem, ValueGetter): return actions +post_save.connect(cached_label_changed, sender=FindBasket) + + class FirstBaseFindView(object): CREATE_SQL = """ CREATE VIEW find_first_base_find diff --git a/ishtar_common/models.py b/ishtar_common/models.py index e5235f808..e8f40a01c 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1381,6 +1381,8 @@ class SearchVectorConfig(object): self.func = func def format(self, value): + if value == 'None': + value = '' if not self.func: return [value] return self.func(value) @@ -4080,6 +4082,8 @@ class IshtarUser(FullSearch): SearchVectorConfig('person__town'), SearchVectorConfig('person__attached_to__name')] + CACHED_LABELS = [] # needed to force search vector update + # search parameters EXTRA_REQUEST_KEYS = { 'person__person_types_list': 'person__person_types__label' @@ -4197,6 +4201,9 @@ class IshtarUser(FullSearch): return self.person.full_label() +post_save.connect(cached_label_changed, sender=IshtarUser) + + class Basket(FullSearch, OwnPerms): """ Abstract class for a basket @@ -4222,8 +4229,11 @@ class Basket(FullSearch, OwnPerms): TABLE_COLS = ['label', 'user'] BASE_SEARCH_VECTORS = [ - SearchVectorConfig('label'), SearchVectorConfig('comment', 'local')] - M2M_SEARCH_VECTORS = [SearchVectorConfig('items')] + SearchVectorConfig('label'), SearchVectorConfig('comment', 'local'), + ] + PARENT_SEARCH_VECTORS = ['user'] + # M2M_SEARCH_VECTORS = [SearchVectorConfig('items')] + CACHED_LABELS = [] # needed to force search vector update class Meta: abstract = True |