diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getBreadcrumbItemList.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getBreadcrumbItemList.xml index c8e323458edb1e2ac807665151b07e4b507a409d..e254e16833251b046f681493137accc7dcf4cc9e 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getBreadcrumbItemList.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getBreadcrumbItemList.xml @@ -119,7 +119,7 @@ folder. The later is recommended for hosting\n multiple sites on a single ERP5Site instance.\n """\n -from ZODB.POSException import ConflictError\n +from zExceptions import Unauthorized\n if document is None: document = context\n crumb_list = []\n \n @@ -133,9 +133,7 @@ for i in range(0, len(chain_list)):\n crumb.title\n , crumb\n ))\n - except ConflictError:\n - raise\n - except:\n + except Unauthorized:\n # We should ignore any item in the chain which raises \n # a security exception. We use a catchall except here\n # because there is no way to import Unauthorized permission\n @@ -198,8 +196,8 @@ return crumb_list\n <value> <tuple> <string>document</string> - <string>ZODB.POSException</string> - <string>ConflictError</string> + <string>zExceptions</string> + <string>Unauthorized</string> <string>None</string> <string>context</string> <string>crumb_list</string> diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_init.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_init.xml index e8643787b62130966f311d49ffb7ce85ad262021..00e989797ec1a0a148b5b99caaadb700c3f832db 100644 --- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_init.xml +++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_init.xml @@ -72,10 +72,7 @@ # Set Web Site layout to default one\n context.setContainerLayout(\'erp5_web_layout\')\n context.setContentLayout(\'erp5_web_content_layout\')\n -\n -# Set default webmaster to current user\n -# user_id = context.portal_membership.getAuthenticatedMember().getUserName()\n -# context.setWebmaster(user_id)\n +context.setLayoutConfigurationFormId(\'WebSection_viewDefaultThemeConfiguration\')\n </string> </value> </item> <item> diff --git a/bt5/erp5_web/bt/revision b/bt5/erp5_web/bt/revision index b0c703c41aeb461a340aaf1f9b0cf3e7ef8dd773..0da6a13444c378ceacbbb43fa35176ab61f1f41a 100644 --- a/bt5/erp5_web/bt/revision +++ b/bt5/erp5_web/bt/revision @@ -1 +1 @@ -628 \ No newline at end of file +630 \ No newline at end of file