diff --git a/bt5/erp5_odt_style/ActionTemplateItem/portal_types/portal_properties/odt_exchange.xml b/bt5/erp5_odt_style/ActionTemplateItem/portal_types/portal_properties/print.xml similarity index 86% rename from bt5/erp5_odt_style/ActionTemplateItem/portal_types/portal_properties/odt_exchange.xml rename to bt5/erp5_odt_style/ActionTemplateItem/portal_types/portal_properties/print.xml index 811d1c4e30f7c6b8090d9625a4fffdb15ced9ab5..d30e5ac0f8b37fe41b5e0c180e0c6188f85d2c3c 100644 --- a/bt5/erp5_odt_style/ActionTemplateItem/portal_types/portal_properties/odt_exchange.xml +++ b/bt5/erp5_odt_style/ActionTemplateItem/portal_types/portal_properties/print.xml @@ -23,7 +23,7 @@ </item> <item> <key> <string>category</string> </key> - <value> <string>object_exchange</string> </value> + <value> <string>object_print</string> </value> </item> <item> <key> <string>condition</string> </key> @@ -39,7 +39,7 @@ </item> <item> <key> <string>id</string> </key> - <value> <string>odt_exchange</string> </value> + <value> <string>print</string> </value> </item> <item> <key> <string>permissions</string> </key> @@ -51,11 +51,11 @@ </item> <item> <key> <string>priority</string> </key> - <value> <float>1.0</float> </value> + <value> <float>2.0</float> </value> </item> <item> <key> <string>title</string> </key> - <value> <string>Export Content as ODT</string> </value> + <value> <string>Print</string> </value> </item> <item> <key> <string>visible</string> </key> @@ -75,7 +75,7 @@ <dictionary> <item> <key> <string>text</string> </key> - <value> <string>string:${folder_url}/Base_viewExchangeFromODTDialog</string> </value> + <value> <string>string:${object_url}/Base_viewPrintDialog</string> </value> </item> </dictionary> </pickle> diff --git a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_printOdt.xml b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_printOdt.xml deleted file mode 100644 index 57627d4581579ecb9027a06fc40cd21504b01e93..0000000000000000000000000000000000000000 --- a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_printOdt.xml +++ /dev/null @@ -1,154 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.PythonScripts.PythonScript</string> - <string>PythonScript</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>Python_magic</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>Script_magic</string> </key> - <value> <int>3</int> </value> - </item> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_bind_names</string> </key> - <value> - <object> - <klass> - <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>_asgns</string> </key> - <value> - <dictionary> - <item> - <key> <string>name_container</string> </key> - <value> <string>container</string> </value> - </item> - <item> - <key> <string>name_context</string> </key> - <value> <string>context</string> </value> - </item> - <item> - <key> <string>name_m_self</string> </key> - <value> <string>script</string> </value> - </item> - <item> - <key> <string>name_subpath</string> </key> - <value> <string>traverse_subpath</string> </value> - </item> - </dictionary> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>_body</string> </key> - <value> <string>context.getPortalObject().changeSkin(\'ODT\')\n -return getattr(context, form_id)()\n -</string> </value> - </item> - <item> - <key> <string>_code</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_filepath</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> - <item> - <key> <string>_params</string> </key> - <value> <string>form_id=\'\'</string> </value> - </item> - <item> - <key> <string>errors</string> </key> - <value> - <tuple/> - </value> - </item> - <item> - <key> <string>func_code</string> </key> - <value> - <object> - <klass> - <global name="FuncCode" module="Shared.DC.Scripts.Signature"/> - </klass> - <tuple/> - <state> - <dictionary> - <item> - <key> <string>co_argcount</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>co_varnames</string> </key> - <value> - <tuple> - <string>form_id</string> - <string>_getattr_</string> - <string>context</string> - <string>getattr</string> - </tuple> - </value> - </item> - </dictionary> - </state> - </object> - </value> - </item> - <item> - <key> <string>func_defaults</string> </key> - <value> - <tuple> - <string></string> - </tuple> - </value> - </item> - <item> - <key> <string>id</string> </key> - <value> <string>Base_printOdt</string> </value> - </item> - <item> - <key> <string>warnings</string> </key> - <value> - <tuple/> - </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_printPdf.xml b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_printPdf.xml index fce2fa070967506ae7f7a735b5185f3cddb47315..23f1aa7582820731266a0d54db8cd3b5ce1af5ac 100644 --- a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_printPdf.xml +++ b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_printPdf.xml @@ -65,9 +65,11 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>portal = context.getPortalObject()\n + <value> <string>\'\'\'Compatibility script for old print action.\n +\'\'\'\n +portal = context.getPortalObject()\n portal.changeSkin(\'ODT\')\n -portal.REQUEST.set(\'format\', \'pdf\')\n +\n return getattr(context, form_id)()\n </string> </value> </item> diff --git a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_viewExchangeFromODTDialog/your_format.xml b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_viewExchangeFromODTDialog/your_format.xml deleted file mode 100644 index a50cb6f9210209889826ec51e498ed7ee5db7217..0000000000000000000000000000000000000000 --- a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_viewExchangeFromODTDialog/your_format.xml +++ /dev/null @@ -1,289 +0,0 @@ -<?xml version="1.0"?> -<ZopeData> - <record id="1" aka="AAAAAAAAAAE="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.StandardFields</string> - <string>ListField</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>id</string> </key> - <value> <string>your_format</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>required_not_found</string> </key> - <value> <string>Input is required but no input given.</string> </value> - </item> - <item> - <key> <string>unknown_selection</string> </key> - <value> <string>You selected an item that was not in the list.</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>extra_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>first_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>items</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>size</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> - </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> <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>extra_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>first_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>items</string> </key> - <value> - <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> - </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>size</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> - </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>1</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>extra_item</string> </key> - <value> <string></string> </value> - </item> - <item> - <key> <string>first_item</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>hidden</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>items</string> </key> - <value> - <list/> - </value> - </item> - <item> - <key> <string>required</string> </key> - <value> <int>0</int> </value> - </item> - <item> - <key> <string>size</string> </key> - <value> <int>1</int> </value> - </item> - <item> - <key> <string>title</string> </key> - <value> <string>Select Format</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> - </dictionary> - </value> - </item> - </dictionary> - </pickle> - </record> - <record id="2" aka="AAAAAAAAAAI="> - <pickle> - <tuple> - <tuple> - <string>Products.Formulator.TALESField</string> - <string>TALESMethod</string> - </tuple> - <none/> - </tuple> - </pickle> - <pickle> - <dictionary> - <item> - <key> <string>_text</string> </key> - <value> <string>python: here.Base_getConversionFormatItemList(base_content_type=\'application/vnd.oasis.opendocument.text\')</string> </value> - </item> - </dictionary> - </pickle> - </record> -</ZopeData> diff --git a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml index 89843c12d9aef8f1d7e35b5d305f3e97b89cf651..e941889d30a3370759f827b283675c87da6dc8d6 100644 --- a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml +++ b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml @@ -331,6 +331,8 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> \n <tal:block tal:condition="report_item/getFormId">\n <tal:block tal:define="form python:getattr(here, report_item.getFormId())" >\n + <!-- TODO: define a macro for multiple prints, for\n + actions using an odt print action. -->\n <tal:block tal:condition="python:form.pt == \'form_view\'">\n <tal:block metal:use-macro="form/form_view/macros/form_layout"/>\n </tal:block>\n diff --git a/bt5/erp5_odt_style/bt/revision b/bt5/erp5_odt_style/bt/revision index dec2bf5d6199c7cd0d84f3dc1e76a73ccc336302..b5045cc4046dbc1d7cafa4c603fd3cdf35dc5dde 100644 --- a/bt5/erp5_odt_style/bt/revision +++ b/bt5/erp5_odt_style/bt/revision @@ -1 +1 @@ -19 \ No newline at end of file +21 \ No newline at end of file diff --git a/bt5/erp5_odt_style/bt/template_action_path_list b/bt5/erp5_odt_style/bt/template_action_path_list index 6fcc64169023af75e86d06ef38e1acab47f36364..2d3c622ec1670cd6265c339bd880c0f24911ca0d 100644 --- a/bt5/erp5_odt_style/bt/template_action_path_list +++ b/bt5/erp5_odt_style/bt/template_action_path_list @@ -1 +1 @@ -portal_properties | odt_exchange \ No newline at end of file +portal_properties | print \ No newline at end of file