diff -r 1cefd3e1ba43 -r b55bdf60c6cd src/pyams_content/features/search/zmi/properties.py --- a/src/pyams_content/features/search/zmi/properties.py Wed Dec 19 10:40:42 2018 +0100 +++ b/src/pyams_content/features/search/zmi/properties.py Wed Dec 19 10:40:58 2018 +0100 @@ -14,24 +14,39 @@ from z3c.form import field +from pyams_content import _ from pyams_content.features.search import ISearchFolder +from pyams_content.interfaces import MANAGE_CONTENT_PERMISSION from pyams_content.shared.common.zmi.properties import SharedContentPropertiesEditForm from pyams_content.shared.view.zmi.properties import ViewPropertiesEditForm +from pyams_form.form import ajax_config from pyams_form.group import NamedWidgetsGroup from pyams_form.interfaces.form import IInnerSubForm from pyams_form.widget import HiddenSelect2FieldWidget +from pyams_pagelet.pagelet import pagelet_config from pyams_skin.layer import IPyAMSLayer from pyams_utils.adapter import adapter_config +from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION from pyams_zmi.form import InnerAdminEditForm -from pyams_content import _ + +@pagelet_config(name='properties.html', context=ISearchFolder, layer=IPyAMSLayer, + permission=VIEW_SYSTEM_PERMISSION) +@ajax_config(name='properties.json', context=ISearchFolder, layer=IPyAMSLayer, + permission=MANAGE_CONTENT_PERMISSION) +class SearchFolderPropertiesEditForm(SharedContentPropertiesEditForm): + """Search folder properties edit form""" + + def updateWidgets(self, prefix=None): + # don't override base widgets update method + super(SharedContentPropertiesEditForm, self).updateWidgets(prefix) @adapter_config(name='view-settings', context=(ISearchFolder, IPyAMSLayer, SharedContentPropertiesEditForm), provides=IInnerSubForm) -class SearchFolderPropertiesEditForm(ViewPropertiesEditForm): - """Search folder properties edit form extension""" +class SearchFolderSettingsEditSubform(ViewPropertiesEditForm): + """Search folder settings edit sub-form extension""" legend = _("Main search settings")