diff -r ac39aec467ea -r 356a54a98a51 src/pyams_default_theme/shared/site/folder.py --- a/src/pyams_default_theme/shared/site/folder.py Mon Feb 01 13:36:23 2021 +0100 +++ b/src/pyams_default_theme/shared/site/folder.py Mon Feb 01 13:48:27 2021 +0100 @@ -15,7 +15,7 @@ from pyramid.httpexceptions import HTTPSeeOther from pyams_content.shared.site import ISiteElementNavigation -from pyams_content.shared.site.interfaces import FOLDER_REDIRECT_DISPLAY_MODE, ISiteFolder +from pyams_content.shared.site.interfaces import SITE_CONTAINER_REDIRECT_MODE, ISiteFolder from pyams_default_theme.interfaces import IContentSummaryInfo from pyams_i18n.interfaces import II18n from pyams_pagelet.pagelet import pagelet_config @@ -65,20 +65,22 @@ """Site folder index page""" def __call__(self, **kwargs): - if self.context.navigation_mode == FOLDER_REDIRECT_DISPLAY_MODE: + if self.context.navigation_mode == SITE_CONTAINER_REDIRECT_MODE: target = next(self.context.get_visible_items(self.request), None) if target is not None: return HTTPSeeOther(relative_url(target, request=self.request)) - return super(SiteFolderIndexPage, self).__call__(**kwargs) + return super().__call__(**kwargs) -@pagelet_config(name='preview.html', context=ISiteFolder, layer=IPyAMSUserLayer, permission=VIEW_SYSTEM_PERMISSION) +@pagelet_config(name='preview.html', context=ISiteFolder, layer=IPyAMSUserLayer, + permission=VIEW_SYSTEM_PERMISSION) class SiteFolderPreviewPage(PortalContextPreviewPage): """Site folder preview page""" def __call__(self, **kwargs): - if self.context.navigation_mode == FOLDER_REDIRECT_DISPLAY_MODE: + if self.context.navigation_mode == SITE_CONTAINER_REDIRECT_MODE: target = next(self.context.get_visible_items(self.request), None) if target is not None: - return HTTPSeeOther(relative_url(target, request=self.request, view_name='preview.html')) - return super(SiteFolderPreviewPage, self).__call__(**kwargs) + return HTTPSeeOther(relative_url(target, request=self.request, + view_name='preview.html')) + return super().__call__(**kwargs)