# HG changeset patch # User Thierry Florac # Date 1520761785 -3600 # Node ID 6c21f15028366151553b9c91a4888896998f69eb # Parent 610a330cb6697eebd4291dc2cf8aac78b2154752 Removed static configuration diff -r 610a330cb669 -r 6c21f1502836 src/pyams_content/root/__init__.py --- a/src/pyams_content/root/__init__.py Sun Mar 11 10:49:21 2018 +0100 +++ b/src/pyams_content/root/__init__.py Sun Mar 11 10:49:45 2018 +0100 @@ -24,7 +24,6 @@ from pyams_form.interfaces.form import IFormContextPermissionChecker from pyams_portal.interfaces import IPortalContext from pyams_security.interfaces import IDefaultProtectionPolicy, IGrantedRoleEvent, ISecurityManager -from pyams_skin.interfaces.configuration import IStaticConfiguration from pyams_utils.interfaces import MANAGE_SYSTEM_PERMISSION from pyams_utils.interfaces.site import IConfigurationFactory, IBackOfficeConfigurationFactory from zope.annotation.interfaces import IAnnotations @@ -33,26 +32,14 @@ from persistent import Persistent from pyams_security.property import RolePrincipalsFieldProperty from pyams_security.security import ProtectedObject -from pyams_skin.configuration import Configuration, StaticConfiguration, BackOfficeConfiguration +from pyams_skin.configuration import Configuration, BackOfficeConfiguration from pyams_skin.skin import UserSkinnableContent from pyams_utils.adapter import adapter_config, ContextAdapter from pyams_utils.registry import get_utility from pyams_utils.site import BaseSiteRoot from pyams_utils.traversing import get_parent from pyramid.events import subscriber -from zope.interface import implementer, Interface - - -@adapter_config(context=(ISiteRoot, Interface, Interface), provides=IStaticConfiguration) -class SiteRootStaticConfiguration(StaticConfiguration): - """Site root static configuration""" - - application_package = 'pyams_content' - application_name = 'PyAMS CMS' - inner_package = 'pyams_skin' - inner_package_name = 'PyAMS' - - include_reload_button = False +from zope.interface import implementer @implementer(IDefaultProtectionPolicy, ISiteRoot, ISiteRootRoles, IPortalContext) diff -r 610a330cb669 -r 6c21f1502836 src/pyams_content/root/zmi/__init__.py --- a/src/pyams_content/root/zmi/__init__.py Sun Mar 11 10:49:21 2018 +0100 +++ b/src/pyams_content/root/zmi/__init__.py Sun Mar 11 10:49:45 2018 +0100 @@ -38,7 +38,7 @@ # import packages from hypatia.catalog import CatalogQuery -from hypatia.query import And, Or, Any, Eq, Any +from hypatia.query import And, Or, Eq, Any from pyams_catalog.query import CatalogResultSet from pyams_content.shared.common import CONTENT_TYPES from pyams_content.shared.common.zmi.dashboard import BaseDashboardTable as BaseDashboardTableBase