Skip to content

erp5
erp5
Commit 7cb0b557 authored by Fabien Morin's avatar Fabien Morin
Browse files
Options

change tales expression to check the key exists and remove a debug field not used 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@23809 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d4116631
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 309 deletions
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/EGov_getAttachmentListFromReportSelection.xml
View file @ 7cb0b557
......@@ -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>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection.xml
View file @ 7cb0b557
......@@ -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>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/debug.xml deleted 100644 → 0
View file @ d4116631
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<tuple>
<global name="TextAreaField" module="Products.Formulator.StandardFields"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>debug</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
<value>
<dictionary>
<item>
<key> <string>external_validator_failed</string> </key>
<value> <string>The input failed the external validator.</string> </value>
</item>
<item>
<key> <string>line_too_long</string> </key>
<value> <string>A line was too long.</string> </value>
</item>
<item>
<key> <string>required_not_found</string> </key>
<value> <string>Input is required but no input given.</string> </value>
</item>
<item>
<key> <string>too_long</string> </key>
<value> <string>You entered too many characters.</string> </value>
</item>
<item>
<key> <string>too_many_lines</string> </key>
<value> <string>You entered too many lines.</string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>overrides</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_lines</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>tales</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_lines</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>editable</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>height</string> </key>
<value> <int>5</int> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>max_length</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_linelength</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>max_lines</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>debug</string> </value>
</item>
<item>
<key> <string>unicode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>whitespace_preserve</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>width</string> </key>
<value> <int>40</int> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python:here.EGov_getAttachmentListFromReportSelection()</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/missing.xml
View file @ 7cb0b557
......@@ -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>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/section_state.xml
View file @ 7cb0b557
......@@ -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>
......
bt5/erp5_egov/SkinTemplateItem/portal_skins/erp5_egov/PDFDocument_viewAttachmentReportSection/your_attachment_title.xml
View file @ 7cb0b557
......@@ -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>
......
bt5/erp5_egov/bt/revision
View file @ 7cb0b557
359
\ No newline at end of file
360
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7