pyams/pyams_content: comparison src/pyams

equal deleted inserted replaced

-:a568b9d2f7dd
+:85e615286c7a
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
 #
-__docformat__ = 'restructuredtext'
 from hypatia.catalog import CatalogQuery
 from hypatia.interfaces import ICatalog
 from hypatia.query import Any, Contains, Eq, Ge, Le
+from pyramid.decorator import reify
 from pyramid.view import view_config
 from z3c.form import field
 from z3c.table.interfaces import IValues
 from zope.interface import implementer
 from zope.intid import IIntIds
 from pyams_content.root import ISiteRoot
 from pyams_content.shared.common import CONTENT_TYPES
 from pyams_content.shared.common.interfaces import CONTENT_TYPES_VOCABULARY
 from pyams_content.shared.common.interfaces.zmi import ISiteRootDashboardTable
 from pyams_content.zmi.interfaces import IAllContentsMenu
+from pyams_form.interfaces.form import ISearchFormFactory, ISearchFormResultsFactory
 from pyams_form.search import ISearchFields, SearchForm, SearchResultsView, SearchView
 from pyams_i18n.interfaces import INegotiator
 from pyams_pagelet.interfaces import PageletCreatedEvent
 from pyams_pagelet.pagelet import pagelet_config
 from pyams_security.schema import Principal
 from pyams_utils.url import absolute_url
 from pyams_viewlet.viewlet import viewlet_config
 from pyams_zmi.layer import IAdminLayer
 from pyams_zmi.view import AdminView
+__docformat__ = 'restructuredtext'
 from pyams_content import _
 #
 # Quick search adapters
 @property
 def data_attributes(self):
 attributes = super(SiteRootQuickSearchResults, self).data_attributes
 attributes['table'] = {
-'data-ams-datatable-sorting': '{0},{1}'.format(len(self.columns) - 1, self.dt_sort_order),
+'data-ams-datatable-sorting':
-'data-ams-datatable-display-length': IAdminProfile(self.request.principal).table_page_length
+'{0},{1}'.format(len(self.columns) - 1, self.dt_sort_order),
+'data-ams-datatable-display-length':
+IAdminProfile(self.request.principal).table_page_length
 }
 return attributes
 @adapter_config(context=(ISiteRoot, IPyAMSLayer, SiteRootQuickSearchResults), provides=IValues)
 else:
 params = Eq(catalog['parents'], intids.register(self.context)) & \
 Any(catalog['content_type'], CONTENT_TYPES.keys())
 query_params = Eq(catalog['oid'], sequence.get_full_oid(query))
 negotiator = get_utility(INegotiator)
-for lang in {self.request.registry.settings.get('pyramid.default_locale_name', 'en'),
+for lang in {self.request.registry.settings.get('pyramid.default_locale_name',
+'en'),
 self.request.locale_name,
 negotiator.server_language} | negotiator.offered_languages:
 index_name = 'title:{0}'.format(lang)
 if index_name in catalog:
 index = catalog[index_name]
 if index.check_query(query):
-query_params |= Contains(index, ' and '.join((w+'*' for w in query.split())))
+query_params |= Contains(index,
+' and '.join((w+'*' for w in query.split())))
 params &= query_params
 return unique(map(get_last_version,
-CatalogResultSet(CatalogQuery(catalog).query(params,
+CatalogResultSet(CatalogQuery(catalog).query(
-sort_index='modified_date',
+params, sort_index='modified_date', reverse=True))))
-reverse=True))))
 else:
 return ()
 #
 def __init__(self, context, request):
 super(SiteRootAdvancedSearchForm, self).__init__(context, request)
 request.registry.notify(PageletCreatedEvent(self))
 apply_skin(self.request, 'PyAMS admin skin')
-fields = field.Fields(ISiteRootAdvancedSearchFields)
+fields_interface = ISiteRootAdvancedSearchFields
-fields['tags'].widgetFactory = ThesaurusTermsTreeFieldWidget
-fields['collections'].widgetFactory = ThesaurusTermsTreeFieldWidget
+@property
+def fields(self):
+fields = field.Fields(self.fields_interface)
+fields['tags'].widgetFactory = ThesaurusTermsTreeFieldWidget
+fields['collections'].widgetFactory = ThesaurusTermsTreeFieldWidget
+return fields
 ajax_handler = 'advanced-search-results.html'
 def updateWidgets(self, prefix=None):
 super(SiteRootAdvancedSearchForm, self).updateWidgets(prefix)
 if 'tags' in self.widgets:
 manager = ICollectionsManager(self.request.root)
 widget.thesaurus_name = manager.thesaurus_name
 widget.extract_name = manager.extract_name
-@adapter_config(context=(ISiteRoot, IPyAMSLayer, SiteRootAdvancedSearchForm), provides=IContentSearch)
+@adapter_config(context=(ISiteRoot, IPyAMSLayer, SiteRootAdvancedSearchForm),
+provides=IContentSearch)
 class SiteRootAdvancedSearchFormSearchAdapter(ContextRequestViewAdapter):
 """Site root advanced search form search adapter"""
 def get_search_results(self, data):
 intids = get_utility(IIntIds)
 params &= Any(catalog['tags'], tags)
 if data.get('collections'):
 tags = [intids.register(term) for term in data['collections']]
 params &= Any(catalog['collections'], tags)
 return unique(map(get_last_version,
-CatalogResultSet(CatalogQuery(catalog).query(params,
+CatalogResultSet(CatalogQuery(catalog).query(
-sort_index='modified_date',
+params, sort_index='modified_date', reverse=True))))
-reverse=True))))
 @pagelet_config(name='advanced-search.html', context=ISiteRoot, layer=IPyAMSLayer,
 permission=VIEW_SYSTEM_PERMISSION)
 class SiteRootAdvancedSearchView(SearchView):
 """Site root advanced search view"""
 search_form_factory = SiteRootAdvancedSearchForm
-@adapter_config(context=(ISiteRoot, IPyAMSLayer, SiteRootAdvancedSearchView), provides=IPageHeader)
+@adapter_config(context=(ISiteRoot, IPyAMSLayer, SiteRootAdvancedSearchView),
+provides=IPageHeader)
 class SiteRootAdvancedSearchHeaderAdapter(DefaultPageHeaderAdapter):
 """Site root advanced search header adapter"""
 back_url = '#dashboard.html'
 back_target = None
 def __init__(self, context, request):
 super(SiteRootAdvancedSearchResultsView, self).__init__(context, request)
 request.registry.notify(PageletCreatedEvent(self))
+@reify
+def search_form(self):
+form = self.request.registry.queryMultiAdapter((self.context, self.request, self),
+ISearchFormResultsFactory)
+if form is None:
+form = self.request.registry.queryMultiAdapter((self.context, self.request, self),
+ISearchFormFactory)
+if form is None:
+form = self.search_form_factory(self.context, self.request)
+return form
 @property
 def data_attributes(self):
 attributes = super(SiteRootAdvancedSearchResultsView, self).data_attributes
 attributes['table'] = {
-'data-ams-datatable-sorting': "{0},{1}".format(len(self.columns) - 1, self.dt_sort_order),
+'data-ams-datatable-sorting':
-'data-ams-datatable-display-length': IAdminProfile(self.request.principal).table_page_length
+"{0},{1}".format(len(self.columns) - 1, self.dt_sort_order),
+'data-ams-datatable-display-length':
+IAdminProfile(self.request.principal).table_page_length
 }
 return attributes
-@adapter_config(context=(ISiteRoot, IPyAMSLayer, SiteRootAdvancedSearchResultsView), provides=IValues)
+@adapter_config(context=(ISiteRoot, IPyAMSLayer, SiteRootAdvancedSearchResultsView),
+provides=IValues)
 class SearchResultsViewValuesAdapter(ContextRequestViewAdapter):
 """Search results view values adapter"""
 @property
 def values(self):
-form = self.view.search_form_factory(self.context, self.request)
+return self.view.search_form.get_search_results() or ()
-return form.get_search_results() or ()

changeset 1407	85e615286c7a
parent 1395	8184dadefc8b
child 1408	916c81459d6b