Skip to content

W
wendelin
Commit 7c94ef28 authored by Klaus Wölfel's avatar Klaus Wölfel
Browse files
Options

Reimplement Data Stream append as Exchange Dialog 

The previous implementation did not support saving categories in view form.
It is better to use standard Base_edit in view forms and put actions which are other than "save"
into a dialog.
parent 7be7fcb6
Show whitespace changes
Inline Side-by-side
Showing with 369 additions and 26 deletions
bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_appendFile.py 0 → 100644
View file @ 7c94ef28
context.appendData(append_file.read())
message = context.Base_translateString("Data Stream updated.")
return context.Base_redirect(
'view',
keep_items=dict(portal_status_message=message)
)
bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_saveDataStream.xml → bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_appendFile.xml
View file @ 7c94ef28
......@@ -50,11 +50,11 @@
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>form_id, **kw</string> </value>
<value> <string>append_file, **kw</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>DataStream_saveDataStream</string> </value>
<value> <string>DataStream_appendFile</string> </value>
</item>
</dictionary>
</pickle>
......
bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_saveDataStream.py deleted 100644 → 0
View file @ 7be7fcb6
request = container.REQUEST
response = request.response
field_prefix = 'field_my_' # Prevent changing the prefix through publisher
field_prefix_len = len(field_prefix)
fields = {}
for key, value in request.form.items():
if key.startswith(field_prefix) and value:
fields[key[field_prefix_len:]] = value
if fields.has_key('append_file'):
context.appendData(fields['append_file'].read())
del fields['append_file']
context.edit(**fields)
message = context.Base_translateString("Data Stream updated")
return context.Base_redirect(
'view',
keep_items=dict(portal_status_message=message),
**kw
)
bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_view.xml
View file @ 7c94ef28
......@@ -14,7 +14,7 @@
</item>
<item>
<key> <string>action</string> </key>
<value> <string>DataStream_saveDataStream</string> </value>
<value> <string>Base_edit</string> </value>
</item>
<item>
<key> <string>description</string> </key>
......@@ -90,7 +90,6 @@
<string>my_filename</string>
<string>my_size</string>
<string>my_file</string>
<string>my_append_file</string>
<string>my_translated_validation_state_title</string>
</list>
</value>
......
bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_viewAppendFileExchangeDialog.xml 0 → 100644
View file @ 7c94ef28
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ERP5 Form" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<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/>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_objects</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>action</string> </key>
<value> <string>DataStream_appendFile</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>edit_order</string> </key>
<value>
<list/>
</value>
</item>
<item>
<key> <string>encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>enctype</string> </key>
<value> <string>multipart/form-data</string> </value>
</item>
<item>
<key> <string>group_list</string> </key>
<value>
<list>
<string>left</string>
</list>
</value>
</item>
<item>
<key> <string>groups</string> </key>
<value>
<dictionary>
<item>
<key> <string>left</string> </key>
<value>
<list>
<string>your_append_file</string>
</list>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>DataStream_viewAppendFileExchangeDialog</string> </value>
</item>
<item>
<key> <string>method</string> </key>
<value> <string>POST</string> </value>
</item>
<item>
<key> <string>name</string> </key>
<value> <string>DataStream_viewAppendFileExchangeForm</string> </value>
</item>
<item>
<key> <string>pt</string> </key>
<value> <string>form_dialog</string> </value>
</item>
<item>
<key> <string>row_length</string> </key>
<value> <int>4</int> </value>
</item>
<item>
<key> <string>stored_encoding</string> </key>
<value> <string>UTF-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Append File</string> </value>
</item>
<item>
<key> <string>unicode_mode</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>update_action</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>update_action_title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_view/my_append_file.xml → bt5/erp5_wendelin/SkinTemplateItem/portal_skins/erp5_wendelin/DataStream_viewAppendFileExchangeDialog/your_append_file.xml
View file @ 7c94ef28
......@@ -2,24 +2,13 @@
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ProxyField" module="Products.ERP5Form.ProxyField"/>
<global name="FileField" module="Products.Formulator.StandardFields"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>css_class</string>
<string>description</string>
<string>hidden</string>
<string>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_append_file</string> </value>
<value> <string>your_append_file</string> </value>
</item>
<item>
<key> <string>message_values</string> </key>
......@@ -29,6 +18,10 @@
<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>
</dictionary>
</value>
</item>
......@@ -37,15 +30,59 @@
<value>
<dictionary>
<item>
<key> <string>field_id</string> </key>
<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>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</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>form_id</string> </key>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>input_type</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>
</dictionary>
......@@ -55,32 +92,58 @@
<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>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<key> <string>editable</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>input_type</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>target</string> </key>
<key> <string>required</string> </key>
<value> <string></string> </value>
</item>
<item>
......@@ -94,33 +157,61 @@
<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>Upload a file to be appended to the current.</string> </value>
<value> <string>Upload a file that will append to the current one.</string> </value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_view_mode_file</string> </value>
<key> <string>display_maxwidth</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>display_width</string> </key>
<value> <int>20</int> </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>form_id</string> </key>
<value> <string>Base_viewDMSFieldLibrary</string> </value>
<key> <string>extra</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>target</string> </key>
<value> <string>Click to edit the target</string> </value>
<key> <string>input_type</string> </key>
<value> <string>text</string> </value>
</item>
<item>
<key> <string>required</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Append file (this will append to existing data)</string> </value>
<value> <string>Append File</string> </value>
</item>
</dictionary>
</value>
......@@ -136,20 +227,7 @@
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: \'hidden_label\' if context.getSize() == 0 else \'\'</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="TALESMethod" module="Products.Formulator.TALESField"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_text</string> </key>
<value> <string>python: context.getSize() == 0</string> </value>
<value> <string>python: preferences.getPreference(\'preferred_string_field_width\', 30)</string> </value>
</item>
</dictionary>
</pickle>
......
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