Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/cs_dynamicpages/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,11 @@

<!-- -*- extra stuff goes here -*- -->

<include package=".upgrades" />

<include package=".vocabularies" />

<include package=".subscribers" />

<include package=".vocabularies" />
<include package=".upgrades" />


<include package=".vocabularies" />


<include package=".controlpanels" />
Expand All @@ -40,7 +36,6 @@

<include package=".views" />

<include package=".vocabularies" />


</configure>
4 changes: 4 additions & 0 deletions src/cs_dynamicpages/indexers/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,9 @@
<!-- Indexers/Metadata -->

<!-- -*- extra stuff goes here -*- -->
<adapter
factory=".content_index_extender.FolderishItemTextExtender"
name="IDexterityContainer"
/>

</configure>
72 changes: 72 additions & 0 deletions src/cs_dynamicpages/indexers/content_index_extender.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
from plone import api
from plone.app.dexterity import textindexer
from plone.dexterity.interfaces import IDexterityContainer
from zope.component import adapter
from zope.interface import implementer


def extract_text_value_to_index(content):
"""convert the text field of a content item to plain text"""
text = (content.text and content.text.output) or ""
pt = api.portal.get_tool("portal_transforms")
data = pt.convertTo("text/plain", text, mimetype="text/html")
return data.getData()


FIELDS_TO_INDEX = {
# Full field name: function to get the indexed value
"IBasic.title": lambda content: content.Title(),
"IBasic.description": lambda content: content.Description(),
"IRichTextBehavior-text": extract_text_value_to_index,
}


@implementer(textindexer.IDynamicTextIndexExtender)
@adapter(IDexterityContainer)
class FolderishItemTextExtender:
def __init__(self, context):
self.context = context

def __call__(self):
layout = self.context.getLayout()
if layout == "dynamic-view":
return get_available_text_from_dynamic_pages(self.context)
return ""


def get_enabled_fields(row_type):
"""return the fields that are enabled to be edited in the given
row type
"""
row_type_fields = api.portal.get_registry_record(
"cs_dynamicpages.dynamic_pages_control_panel.row_type_fields"
)

for item in row_type_fields:
if item["row_type"] == row_type:
return item["each_row_type_fields"]

return []


def get_available_text_from_dynamic_pages(context):
"""this should return the indexable texts
for a given dynamic page

it should extract the texts from the row container in the context
"""
value = []
brains = api.content.find(
portal_type="DynamicPageRow",
review_state="published",
context=context,
)
for brain in brains:
drr = brain.getObject()
enabled_fields = get_enabled_fields(drr.row_type)
for enabled_field in enabled_fields:
extract_content_function = FIELDS_TO_INDEX.get(enabled_field)
if extract_content_function is not None:
value.append(extract_content_function(drr))

return " ".join(value)
Empty file.
29 changes: 29 additions & 0 deletions src/cs_dynamicpages/subscribers/configure.zcml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<configure
xmlns="http://namespaces.zope.org/zope"
i18n_domain="cs_dynamicpages"
>

<!-- -*- extra stuff goes here -*- -->

<subscriber
for="cs_dynamicpages.content.dynamic_page_row.IDynamicPageRow
zope.lifecycleevent.interfaces.IObjectModifiedEvent"
handler=".index_contents_in_parents.handler"
/>

<subscriber
for="cs_dynamicpages.content.dynamic_page_row.IDynamicPageRow
Products.CMFCore.interfaces.IActionSucceededEvent"
handler=".index_contents_in_parents.handler"
/>

<subscriber
for="cs_dynamicpages.content.dynamic_page_row.IDynamicPageRow
zope.lifecycleevent.interfaces.IObjectRemovedEvent"
handler=".index_contents_in_parents.handler"
/>




</configure>
15 changes: 15 additions & 0 deletions src/cs_dynamicpages/subscribers/index_contents_in_parents.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from Acquisition import aq_parent
from cs_dynamicpages import logger


def handler(obj, event):
"""When modifying a DynamicPageRow, we need to index the contents of the
item where this row is shown.
To do so we go up in the tree until we reach the content and force
the reindex of it.
"""
dynamic_page_folder = aq_parent(obj)
if dynamic_page_folder.portal_type == "DynamicPageFolder":
content = aq_parent(dynamic_page_folder)
content.reindexObject()
logger.info("Reindex item: %s", "/".join(content.getPhysicalPath()))
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
from cs_dynamicpages.testing import CS_DYNAMICPAGES_FUNCTIONAL_TESTING
from cs_dynamicpages.testing import CS_DYNAMICPAGES_INTEGRATION_TESTING
from plone.app.testing import setRoles
from plone.app.testing import TEST_USER_ID

import unittest


class SubscriberIntegrationTest(unittest.TestCase):
layer = CS_DYNAMICPAGES_INTEGRATION_TESTING

def setUp(self):
self.portal = self.layer["portal"]
setRoles(self.portal, TEST_USER_ID, ["Manager"])


class SubscriberFunctionalTest(unittest.TestCase):
layer = CS_DYNAMICPAGES_FUNCTIONAL_TESTING

def setUp(self):
self.portal = self.layer["portal"]
setRoles(self.portal, TEST_USER_ID, ["Manager"])
25 changes: 13 additions & 12 deletions src/cs_dynamicpages/views/dynamic_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,19 @@ def dynamic_page_folder_element(self):
if page_folders:
return page_folders
else:
alsoProvides(self.request, IDisableCSRFProtection)
api.content.create(
container=self.context,
type="DynamicPageFolder",
title="Rows",
)
return api.content.find(
portal_type="DynamicPageFolder",
context=self.context,
depth=1,
sort_on="getObjPositionInParent",
)
if self.can_edit():
alsoProvides(self.request, IDisableCSRFProtection)
api.content.create(
container=self.context,
type="DynamicPageFolder",
title="Rows",
)
return api.content.find(
portal_type="DynamicPageFolder",
context=self.context,
depth=1,
sort_on="getObjPositionInParent",
)

def dynamic_page_folder_element_url(self):
dynamic_page_folder = self.dynamic_page_folder_element()
Expand Down