[Erp5-report] r21113 - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5_web/...

[nobody at svn.erp5.org]

Author: jp
Date: Mon May 26 09:57:34 2008
New Revision: 21113

URL: http://svn.erp5.org?rev=21113&view=rev
Log:
Automatically set configuration form. Use Unauthorized exception to catch invisible breadcrumb.

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getBreadcrumbItemList.xml
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_init.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getBreadcrumbItemList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getBreadcrumbItemList.xml?rev=21113&r1=21112&r2=21113&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getBreadcrumbItemList.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSection_getBreadcrumbItemList.xml Mon May 26 09:57:34 2008
@@ -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 @@
                      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 @@
                         <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>

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_init.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_init.xml?rev=21113&r1=21112&r2=21113&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_init.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_init.xml Mon May 26 09:57:34 2008
@@ -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>

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=21113&r1=21112&r2=21113&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision Mon May 26 09:57:34 2008
@@ -1,1 +1,1 @@
-628
+630