From fa30c1ff6247097b0e0f01c1b67c46f3dc1f26dc Mon Sep 17 00:00:00 2001 From: Manuel Reinhardt Date: Wed, 5 Jun 2024 14:10:02 +0200 Subject: [PATCH] More SearchableText additions and fixes Ref syslabcom/scrum#2226 --- src/recensio/plone/behaviors/article.py | 1 + src/recensio/plone/behaviors/base_presentation.py | 2 -- src/recensio/plone/behaviors/book_review.py | 3 +++ src/recensio/plone/behaviors/journal_review.py | 5 +++++ src/recensio/plone/behaviors/reference_authors.py | 2 +- 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/recensio/plone/behaviors/article.py b/src/recensio/plone/behaviors/article.py index 4cb607b..d3292fc 100644 --- a/src/recensio/plone/behaviors/article.py +++ b/src/recensio/plone/behaviors/article.py @@ -34,6 +34,7 @@ class IArticle(model.Schema): required=False, ) directives.order_after(translatedTitle="IArticle.subtitle") + textindexer.searchable("translatedTitle") translatedTitle = schema.TextLine( title=_("Translated Title"), required=False, diff --git a/src/recensio/plone/behaviors/base_presentation.py b/src/recensio/plone/behaviors/base_presentation.py index 5dbc9c1..a632130 100644 --- a/src/recensio/plone/behaviors/base_presentation.py +++ b/src/recensio/plone/behaviors/base_presentation.py @@ -1,5 +1,4 @@ from plone import api -from plone.app.dexterity import textindexer from plone.autoform import directives from plone.autoform.interfaces import IFormFieldProvider from plone.dexterity.interfaces import IDexterityContent @@ -26,7 +25,6 @@ class IBasePresentation(model.Schema): required=False, ) directives.mode(labelPresentationAuthor="display") - textindexer.searchable("labelPresentationAuthor") reviewAuthorHonorific = schema.Choice( title=_("Honorific Title"), diff --git a/src/recensio/plone/behaviors/book_review.py b/src/recensio/plone/behaviors/book_review.py index dc14362..930d187 100644 --- a/src/recensio/plone/behaviors/book_review.py +++ b/src/recensio/plone/behaviors/book_review.py @@ -48,6 +48,7 @@ class IBookReview(model.Schema): required=False, ) + textindexer.searchable("isbn_online") isbn_online = schema.TextLine( title=_("ISBN (Online)"), description=_( @@ -120,6 +121,7 @@ class IEditedVolume(model.Schema): directives.widget(additionalTitles=DataGridFieldFactory) textindexer.searchable("additionalTitles") + textindexer.searchable("isbn") isbn = schema.TextLine( title=_("ISBN"), description=_( @@ -132,6 +134,7 @@ class IEditedVolume(model.Schema): required=False, ) + textindexer.searchable("isbn_online") isbn_online = schema.TextLine( title=_("ISBN (Online)"), description=_( diff --git a/src/recensio/plone/behaviors/journal_review.py b/src/recensio/plone/behaviors/journal_review.py index c783a7c..77b4008 100644 --- a/src/recensio/plone/behaviors/journal_review.py +++ b/src/recensio/plone/behaviors/journal_review.py @@ -1,3 +1,4 @@ +from plone.app.dexterity import textindexer from plone.autoform import directives from plone.autoform.interfaces import IFormFieldProvider from plone.dexterity.interfaces import IDexterityContent @@ -12,6 +13,7 @@ @provider(IFormFieldProvider) class IJournalReview(model.Schema): + textindexer.searchable("issn") issn = schema.TextLine( title=_("ISSN"), description=_( @@ -21,6 +23,7 @@ class IJournalReview(model.Schema): required=False, ) + textindexer.searchable("issn_online") issn_online = schema.TextLine( title=_("ISSN Online"), description=_( @@ -86,6 +89,7 @@ class IJournalReview(model.Schema): @provider(IFormFieldProvider) class IJournalArticleReview(model.Schema): + textindexer.searchable("issn") issn = schema.TextLine( title=_("ISSN"), description=_( @@ -95,6 +99,7 @@ class IJournalArticleReview(model.Schema): required=False, ) + textindexer.searchable("issn_online") issn_online = schema.TextLine( title=_("ISSN Online"), description=_( diff --git a/src/recensio/plone/behaviors/reference_authors.py b/src/recensio/plone/behaviors/reference_authors.py index bbbb43a..513915d 100644 --- a/src/recensio/plone/behaviors/reference_authors.py +++ b/src/recensio/plone/behaviors/reference_authors.py @@ -43,7 +43,7 @@ class IReferenceAuthors(model.Schema): value_type=DictRow(schema=IReferenceAuthorRowSchema, required=False), required=False, ) - textindexer.searchable("editorial") + textindexer.searchable("referenceAuthors") fieldset_review(["referenceAuthors"])