Commit c578bfa1 authored by Kevin Deldycke's avatar Kevin Deldycke

Add a dynamic warning message to the OOo Calc import tool to remind user to...

Add a dynamic warning message to the OOo Calc import tool to remind user to re-upload the file. This is a know limitation of the current implementation. A bug report has been written for this.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7602 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 807f2b13
...@@ -112,7 +112,8 @@ if len(listbox) == 0:\n ...@@ -112,7 +112,8 @@ if len(listbox) == 0:\n
spreadsheets = getSpreadsheet()\n spreadsheets = getSpreadsheet()\n
# Put the result of OOo parsing in the request\n # Put the result of OOo parsing in the request\n
request.set(\'ooo_import_spreadsheet_data\', spreadsheets)\n request.set(\'ooo_import_spreadsheet_data\', spreadsheets)\n
\n # Set a flag in the request to differentiate the two steps\n
request.set(\'OOOIMPORT_STEP_TWO\', True)\n
\n \n
# Second Step\n # Second Step\n
else:\n else:\n
...@@ -253,6 +254,7 @@ return context.ERP5Site_importObjectFromOOoFastInput(REQUEST=request)\n ...@@ -253,6 +254,7 @@ return context.ERP5Site_importObjectFromOOoFastInput(REQUEST=request)\n
<string>None</string> <string>None</string>
<string>len</string> <string>len</string>
<string>spreadsheets</string> <string>spreadsheets</string>
<string>True</string>
<string>mapping</string> <string>mapping</string>
<string>listbox_ordered_lines</string> <string>listbox_ordered_lines</string>
<string>_getiter_</string> <string>_getiter_</string>
......
...@@ -107,6 +107,7 @@ ...@@ -107,6 +107,7 @@
<list> <list>
<string>my_import_file</string> <string>my_import_file</string>
<string>openoffice_template</string> <string>openoffice_template</string>
<string>warning</string>
</list> </list>
</value> </value>
</item> </item>
......
...@@ -186,6 +186,10 @@ ...@@ -186,6 +186,10 @@
<key> <string>columns</string> </key> <key> <string>columns</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
</item> </item>
<item>
<key> <string>count_method</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>css_class</string> </key> <key> <string>css_class</string> </key>
<value> <string></string> </value> <value> <string></string> </value>
......
...@@ -144,7 +144,9 @@ ...@@ -144,7 +144,9 @@
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <string></string> </value> <value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item> </item>
<item> <item>
<key> <string>external_validator</string> </key> <key> <string>external_validator</string> </key>
...@@ -267,4 +269,23 @@ You can find an OpenOffice template at <a href="openoffice-erp5-objects-template ...@@ -267,4 +269,23 @@ You can find an OpenOffice template at <a href="openoffice-erp5-objects-template
</dictionary> </dictionary>
</pickle> </pickle>
</record> </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: not here.REQUEST.get(\'OOOIMPORT_STEP_TWO\', False)</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData> </ZopeData>
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