--- a/src/pyams_content/shared/common/zmi/search.py Wed Jul 01 18:05:38 2020 +0200
+++ b/src/pyams_content/shared/common/zmi/search.py Fri Jul 03 12:27:49 2020 +0200
@@ -9,10 +9,6 @@
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
#
-from pyams_content.shared.common.interfaces.types import DATA_TYPES_VOCABULARY, ITypedSharedTool
-
-
-__docformat__ = 'restructuredtext'
from hypatia.catalog import CatalogQuery
from hypatia.interfaces import ICatalog
@@ -26,11 +22,13 @@
from zope.schema import Choice, Datetime
from pyams_catalog.query import CatalogResultSet
-from pyams_content.component.theme.interfaces import ICollectionsManager, ICollectionsManagerTarget, ITagsManager, \
- IThemesManager, IThemesManagerTarget
+from pyams_content.component.theme.interfaces import ICollectionsManager, \
+ ICollectionsManagerTarget, ITagsManager, IThemesManager, IThemesManagerTarget
from pyams_content.profile.interfaces import IAdminProfile
from pyams_content.shared.common import CONTENT_TYPES
-from pyams_content.shared.common.interfaces import IBaseSharedTool, SHARED_TOOL_WORKFLOW_STATES_VOCABULARY
+from pyams_content.shared.common.interfaces import IBaseSharedTool, \
+ SHARED_TOOL_WORKFLOW_STATES_VOCABULARY
+from pyams_content.shared.common.interfaces.types import DATA_TYPES_VOCABULARY, ITypedSharedTool
from pyams_content.shared.common.interfaces.zmi import ISharedToolDashboardTable
from pyams_content.zmi.interfaces import IAllContentsMenu
from pyams_form.search import ISearchFields, SearchForm, SearchResultsView, SearchView
@@ -61,6 +59,9 @@
from pyams_zmi.layer import IAdminLayer
from pyams_zmi.view import AdminView
+
+__docformat__ = 'restructuredtext'
+
from pyams_content import _
@@ -227,10 +228,7 @@
fields['themes'].widgetFactory = ThesaurusTermsTreeFieldWidget
else:
fields = fields.omit('themes')
- if ICollectionsManagerTarget.providedBy(self.context):
- fields['collections'].widgetFactory = ThesaurusTermsTreeFieldWidget
- else:
- fields = fields.omit('collections')
+ fields['collections'].widgetFactory = ThesaurusTermsTreeFieldWidget
return fields
def updateWidgets(self, prefix=None):
@@ -247,7 +245,7 @@
widget.extract_name = manager.extract_name
if 'collections' in self.widgets:
widget = self.widgets['collections']
- manager = ICollectionsManager(self.context)
+ manager = ICollectionsManager(self.request.root)
widget.thesaurus_name = manager.thesaurus_name
widget.extract_name = manager.extract_name