[Erp5-report] r23512 - /erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp...
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Sep 9 15:03:49 CEST 2008
Author: mayoro
Date: Tue Sep 9 15:03:40 2008
New Revision: 23512
URL: http://svn.erp5.org?rev=23512&view=rev
Log:
2008-09-095: mayoro
- adding possibility to select business templates in report mode (HTML and ODT)
Modified:
erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml
erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getERP5SiteDocumentationReport.xml
erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_viewReportDialog.xml
Modified: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml?rev=23512&r1=23511&r2=23512&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml (original)
+++ erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getDocumentationSectionList.xml Tue Sep 9 15:03:40 2008
@@ -124,7 +124,7 @@
ReportSection(\n
path=context.getPortalObject().portal_classes.getRelativeUrl(),\n
level=3,\n
- title= getTitle(uri),\n
+ title=getTitle(uri),\n
form_id=\'\')\n
)\n
result.append(\n
@@ -146,7 +146,7 @@
listbox_display_mode=\'FlatListMode\')\n
)\n
portal_skin = REQUEST.get(\'portal_skin\')\n
- if portal_skin is None:\n
+ if portal_skin is None or portal_skin == \'View\':\n
for child_uri in uri_object.getSectionList():\n
class_name = child_uri.getClassName()\n
result += context.DocumentationHelper_getDocumentationSectionListParams(class_name, child_uri.uri_list)\n
Modified: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getERP5SiteDocumentationReport.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getERP5SiteDocumentationReport.xml?rev=23512&r1=23511&r2=23512&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getERP5SiteDocumentationReport.xml (original)
+++ erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_getERP5SiteDocumentationReport.xml Tue Sep 9 15:03:40 2008
@@ -65,21 +65,16 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-tab_url = context.absolute_url().split(\':\')\n
-host = \'%s:%s\' % (tab_url[0],tab_url[1])\n
-url = tab_url[2].split(\'/\')\n
-new_url = \'/\'.join(url[:-1])\n
-portal_url = \'%s:%s\' % (host,new_url)\n
+ <value> <string>from ZTUtils import make_query\n
+portal_url = context.getPortalObject().portal_url()\n
uri = context.getPortalObject().getUrl()\n
-if portal_skin==\'ODT\':\n
- return context.REQUEST.RESPONSE.redirect(\'%s/portal_classes/DocumentationHelper_viewReport?uri=%s&class_name=ERP5SiteDocumentationHelper&portal_skin=ODT\' % (portal_url, uri))\n
+if portal_skin == \'ODT\':\n
+ query = make_query(uri=uri, class_name="ERP5SiteDocumentationHelper", portal_skin="ODT", business_template_list=business_template_list)\n
+ return context.REQUEST.RESPONSE.redirect(\'%s/portal_classes/DocumentationHelper_viewReport?%s\' % (portal_url, query) )\n
else:\n
- return context.REQUEST.RESPONSE.redirect(\'%s/portal_classes/DocumentationHelper_viewReport?uri=%s&class_name=ERP5SiteDocumentationHelper\' % (portal_url, uri))\n
-
-
-]]></string> </value>
+ query = make_query(uri=uri, class_name="ERP5SiteDocumentationHelper", portal_skin="View", business_template_list=business_template_list)\n
+ return context.REQUEST.RESPONSE.redirect(\'%s/portal_classes/DocumentationHelper_viewReport?%s\' % (portal_url, query) )\n
+</string> </value>
</item>
<item>
<key> <string>_code</string> </key>
@@ -95,7 +90,7 @@
</item>
<item>
<key> <string>_params</string> </key>
- <value> <string>portal_skin=\'\'</string> </value>
+ <value> <string>portal_skin=\'\', business_template_list=[]</string> </value>
</item>
<item>
<key> <string>errors</string> </key>
@@ -115,22 +110,21 @@
<dictionary>
<item>
<key> <string>co_argcount</string> </key>
- <value> <int>1</int> </value>
+ <value> <int>2</int> </value>
</item>
<item>
<key> <string>co_varnames</string> </key>
<value>
<tuple>
<string>portal_skin</string>
+ <string>business_template_list</string>
+ <string>ZTUtils</string>
+ <string>make_query</string>
<string>_getattr_</string>
<string>context</string>
- <string>tab_url</string>
- <string>_getitem_</string>
- <string>host</string>
- <string>url</string>
- <string>new_url</string>
<string>portal_url</string>
<string>uri</string>
+ <string>query</string>
</tuple>
</value>
</item>
@@ -144,6 +138,7 @@
<value>
<tuple>
<string></string>
+ <list/>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_viewReportDialog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_viewReportDialog.xml?rev=23512&r1=23511&r2=23512&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_viewReportDialog.xml (original)
+++ erp5/trunk/bt5/erp5_documentation/SkinTemplateItem/portal_skins/erp5_documentation/DocumentationHelper_viewReportDialog.xml Tue Sep 9 15:03:40 2008
@@ -109,7 +109,9 @@
<item>
<key> <string>right</string> </key>
<value>
- <list/>
+ <list>
+ <string>your_business_template_list</string>
+ </list>
</value>
</item>
</dictionary>
More information about the Erp5-report
mailing list