[Erp5-report] r35617 ivan - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: ivan
Date: Tue May 25 15:52:45 2010
New Revision: 35617

URL: http://svn.erp5.org?rev=35617&view=rev
Log:
Try to pass current web site from outside to pop up renderer.

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml?rev=35617&r1=35616&r2=35617&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Base_getSummaryAsHTML.xml [utf8] Tue May 25 15:52:45 2010
@@ -66,7 +66,6 @@
   html = ""\n
   reference = context.getReference() or \'\'\n
   if context.REQUEST.get(\'is_web_mode\', False):\n
-    website = context.getWebSiteValue() or context.REQUEST.get(\'current_web_site\')\n
     if reference:\n
       html += """\n
           <a href="%s">\n
@@ -89,7 +88,8 @@
 url = context.absolute_url()\n
 title = context.getTitle() or (hasattr(context, \'getReference\') and context.getReference()) or context.getId()\n
 portal_type = context.getTranslatedPortalType()\n
-popup = context.Document_getPopupInfo() or \'\'\n
+website = context.getWebSiteValue() or context.REQUEST.get(\'current_web_site\')\n
+popup = context.Document_getPopupInfo(context.REQUEST.get(\'current_web_site\')) or \'\'\n
 selection = None\n
 selection_name = context.REQUEST.get("selection_name", None)\n
 if selection_name is not None:\n
@@ -186,6 +186,7 @@
                         <value>
                           <tuple>
                             <string>getOwnerHTML</string>
+                            <string>website</string>
                             <string>getReferenceHTML</string>
                             <string>_getattr_</string>
                             <string>context</string>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=35617&r1=35616&r2=35617&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Tue May 25 15:52:45 2010
@@ -1,1 +1,1 @@
-754
+755