diff --git a/src/privatim/__init__.py b/src/privatim/__init__.py index 031c08a..1e0e6ed 100644 --- a/src/privatim/__init__.py +++ b/src/privatim/__init__.py @@ -132,13 +132,9 @@ def upgrade(context: 'UpgradeContext'): # type: ignore[no-untyped-def] ), ) - if not context.has_column( - 'consultations', 'searchable_text_de_CH' - ): - for column in ('searchable_text_de_CH',): - if not context.has_column('consultations', column): - context.operations.add_column( - 'consultations', Column(column, TSVECTOR()) - ) + context.operations.add_column( + 'consultations', + Column('searchable_text_de_CH', TSVECTOR()) +) context.commit() diff --git a/src/privatim/models/__init__.py b/src/privatim/models/__init__.py index 9d4932e..6c71265 100644 --- a/src/privatim/models/__init__.py +++ b/src/privatim/models/__init__.py @@ -75,7 +75,7 @@ def includeme(config: 'Configurator') -> None: def update_fulltext_search_text( - mapper: 'Mapper[Incomplete]', connection: 'Connection', target: Incomplete + mapper: 'Mapper[SearchableAssociatedFiles]', connection: 'Connection', target: SearchableAssociatedFiles ) -> None: """ Event listener for the 'files' relationship. Triggers a full reindex diff --git a/src/privatim/views/search.py b/src/privatim/views/search.py index f8ffc1d..0a6aaa8 100644 --- a/src/privatim/views/search.py +++ b/src/privatim/views/search.py @@ -61,7 +61,7 @@ class SearchCollection: | term | tsquery | |------|---------| - | the donkey | |'donkey' | + | the donkey | 'donkey' | | "blue donkey" | 'blue' & 'donkey' | See also: @@ -97,7 +97,7 @@ def search_in_columns( self, model: type['HasSearchableFields'] ) -> list[SearchResult]: query = self.build_attribute_query(model) - raw_results = self.session.execute(query).all() + raw_results = self.session.execute(query) return [ SearchResult( id=result.id, @@ -116,9 +116,8 @@ def search_in_model_files( self, model: SearchableAssociatedFiles ) -> list[SearchResult]: query = self.build_file_query(model) - raw_results = self.session.execute(query).all() results_list = [] - for result in raw_results: + for result in self.session.execute(query): search_result = SearchResult( id=result.id, headlines={ diff --git a/src/privatim/views/templates/activities.pt b/src/privatim/views/templates/activities.pt index 6c78a0b..de1e85a 100644 --- a/src/privatim/views/templates/activities.pt +++ b/src/privatim/views/templates/activities.pt @@ -14,8 +14,7 @@
Add - Consultation + class="btn btn-primary" role="button" tabindex="1">Add Consultation