Skip to content

erp5
erp5
Commit ef179fc3 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

odt style is a style for print, not exchange. Update action accordingly, and... 

odt style is a style for print, not exchange. Update action accordingly, and removes some obsoleted skins.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18027 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 0253bd46
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 452 deletions
bt5/erp5_odt_style/ActionTemplateItem/portal_types/portal_properties/odt_exchange.xml → bt5/erp5_odt_style/ActionTemplateItem/portal_types/portal_properties/print.xml
View file @ ef179fc3
......@@ -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>
......
bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_printOdt.xml deleted 100644 → 0
View file @ 0253bd46
<?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>
bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_core/Base_printPdf.xml
View file @ ef179fc3
......@@ -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>
......
bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml
View file @ ef179fc3
......@@ -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
......
bt5/erp5_odt_style/bt/revision
View file @ ef179fc3
19
\ No newline at end of file
21
\ No newline at end of file
bt5/erp5_odt_style/bt/template_action_path_list
View file @ ef179fc3
portal_properties | odt_exchange
\ No newline at end of file
portal_properties | print
\ 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