[Erp5-report] r23808 - in /erp5/trunk/bt5/erp5_egov: SkinTemplateItem/portal_skins/erp5_ego...
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Sep 25 11:48:19 CEST 2008
Author: fabien
Date: Thu Sep 25 11:48:11 2008
New Revision: 23808
URL: http://svn.erp5.org?rev=23808&view=rev
Log:
change tales expression to check the key exists and remove a debug field not used
Modified:
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getAttachmentListFromReportSelection.xml
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection.xml
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/missing.xml
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/section_state.xml
erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/your_attachment_title.xml
erp5/trunk/bt5/erp5_egov/bt/revision
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getAttachmentListFromReportSelection.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getAttachmentListFromReportSelection.xml?rev=23808&r1=23807&r2=23808&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getAttachmentListFromReportSelection.xml (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getAttachmentListFromReportSelection.xml Thu Sep 25 11:48:11 2008
@@ -55,8 +55,9 @@
<key> <string>_body</string> </key>
<value> <string>params = context.portal_selections.getSelectionParamsFor(\'attachment_selection\',\n
REQUEST=context.REQUEST)\n
-\n
-return params[\'attachment_list\']\n
+if params.has_key(\'attachment_list\'):\n
+ return params[\'attachment_list\']\n
+return []\n
</string> </value>
</item>
<item>
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection.xml?rev=23808&r1=23807&r2=23808&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection.xml (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection.xml Thu Sep 25 11:48:11 2008
@@ -98,7 +98,6 @@
<key> <string>white_background</string> </key>
<value>
<list>
- <string>debug</string>
<string>section_title</string>
<string>section_state</string>
<string>missing</string>
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/missing.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/missing.xml?rev=23808&r1=23807&r2=23808&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/missing.xml (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/missing.xml Thu Sep 25 11:48:11 2008
@@ -291,7 +291,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:context.portal_selections.getSelectionParamsFor(\'attachment_selection\', REQUEST=context.REQUEST)[\'requirement\'] == context.getPortalObject().Base_translateString(\'Required\') and not len(context.EGov_getAttachmentListFromReportSelection())</string> </value>
+ <value> <string>python:context.portal_selections.getSelectionParamsFor(\'attachment_selection\', REQUEST=context.REQUEST).has_key(\'requirement\') and context.portal_selections.getSelectionParamsFor(\'attachment_selection\', REQUEST=context.REQUEST)[\'requirement\'] == context.getPortalObject().Base_translateString(\'Required\') and not len(context.EGov_getAttachmentListFromReportSelection())</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/section_state.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/section_state.xml?rev=23808&r1=23807&r2=23808&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/section_state.xml (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/section_state.xml Thu Sep 25 11:48:11 2008
@@ -275,7 +275,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:context.portal_selections.getSelectionParamsFor(\'attachment_selection\', REQUEST=context.REQUEST)[\'requirement\']</string> </value>
+ <value> <string>python:context.portal_selections.getSelectionParamsFor(\'attachment_selection\', REQUEST=context.REQUEST).has_key(\'requirement\') and context.portal_selections.getSelectionParamsFor(\'attachment_selection\', REQUEST=context.REQUEST)[\'requirement\']</string> </value>
</item>
</dictionary>
</pickle>
@@ -291,7 +291,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:not context.portal_selections.getSelectionParamsFor(\'attachment_selection\', REQUEST=context.REQUEST)[\'requirement\'] == context.getPortalObject().Base_translateString(\'Required\') and not len(context.EGov_getAttachmentListFromReportSelection())</string> </value>
+ <value> <string>python:context.portal_selections.getSelectionParamsFor(\'attachment_selection\', REQUEST=context.REQUEST).has_key(\'requirement\') and not context.portal_selections.getSelectionParamsFor(\'attachment_selection\', REQUEST=context.REQUEST)[\'requirement\'] == context.getPortalObject().Base_translateString(\'Required\') and not len(context.EGov_getAttachmentListFromReportSelection())</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/your_attachment_title.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/your_attachment_title.xml?rev=23808&r1=23807&r2=23808&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/your_attachment_title.xml (original)
+++ erp5/trunk/bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/your_attachment_title.xml Thu Sep 25 11:48:11 2008
@@ -273,7 +273,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
- <value> <string>python:context.portal_selections.getSelectionParamsFor(\'attachment_selection\', REQUEST=context.REQUEST)[\'title\']</string> </value>
+ <value> <string>python:context.portal_selections.getSelectionParamsFor(\'attachment_selection\', REQUEST=context.REQUEST).has_key(\'title\') and context.portal_selections.getSelectionParamsFor(\'attachment_selection\', REQUEST=context.REQUEST)[\'title\']</string> </value>
</item>
</dictionary>
</pickle>
Modified: erp5/trunk/bt5/erp5_egov/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_egov/bt/revision?rev=23808&r1=23807&r2=23808&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_egov/bt/revision (original)
+++ erp5/trunk/bt5/erp5_egov/bt/revision Thu Sep 25 11:48:11 2008
@@ -1,1 +1,1 @@
-359
+360
More information about the Erp5-report
mailing list