[Erp5-report] r32783 ivan - in /erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style: SkinTe...

[nobody at svn.erp5.org]

Author: ivan
Date: Thu Feb 18 14:46:07 2010
New Revision: 32783

URL: http://svn.erp5.org?rev=32783&view=rev
Log:
If a tab is rendered inline make a simple check and show a message to user if tab can not be rendered.
This is especially nasty when for example user tries to open a tab, it fails (then tabs' Id cookie is saved in user browser). Next page view will brake whole ERP5 front page (then this failing tab is loaded inlined).

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_view.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_view.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_view.xml?rev=32783&r1=32782&r2=32783&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_view.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_access_tab/ERP5Site_view.xml [utf8] Thu Feb 18 14:46:07 2010
@@ -44,13 +44,19 @@
            xmlns:i18n="http://xml.zope.org/namespaces/i18n"\n
            tal:define="tab here/ERP5Site_getSelectedTab;\n
                                preferred_access_tab python:here.portal_preferences.getPreferredHtmlStyleAccessTab()">\n
-  <tal:block tal:condition="python:tab is not None and preferred_access_tab">\n
+  <tal:block tal:condition="python:tab is not None and preferred_access_tab"\n
+             tal:define="tab_renderer_form_object python: getattr(here, tab[\'renderer\'], None)">\n
     <metal:block use-macro="here/erp5_site_main_template/macros/master">\n
       <metal:block fill-slot="tabs">\n
         <tal:block tal:replace="structure python:here.ERP5Site_renderTabList(selected_tab=tab[\'id\'])" />\n
       </metal:block>\n
       <metal:block fill-slot="content">\n
-        <tal:block tal:replace="structure python:getattr(here, tab[\'renderer\'])()" />\n
+        <tal:block tal:condition="tab_renderer_form_object"\n
+                   tal:replace="structure python: tab_renderer_form_object()" />\n
+        <tal:block tal:condition="not: tab_renderer_form_object">\n
+          Server side error.\n
+        </tal:block>\n
+        \n
       </metal:block>\n
     </metal:block>\n
   </tal:block>\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision?rev=32783&r1=32782&r2=32783&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_xhtml_style/bt/revision [utf8] Thu Feb 18 14:46:07 2010
@@ -1,1 +1,1 @@
-898
+899