Skip to content

erp5
erp5
Commit 785fa5e8 authored by Sebastien Robin's avatar Sebastien Robin
Browse files
Options

Workflow cleanup: this looks changes introduced by mistake

parent 1d2812ac
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 239 deletions
bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/SolverType_view.xml
View file @ 785fa5e8
......@@ -103,7 +103,6 @@
<string>my_type_property_sheet_list</string>
<string>my_type_base_category_list</string>
<string>my_type_icon</string>
<string>my_type_workflow_list</string>
</list>
</value>
</item>
......
bt5/erp5_configurator/SkinTemplateItem/portal_skins/erp5_configurator/BusinessConfigurationModule_viewBusinessConfigurationList/listbox.xml
View file @ 785fa5e8
......@@ -9,9 +9,7 @@
<item>
<key> <string>delegated_list</string> </key>
<value>
<list>
<string>columns</string>
</list>
<list/>
</value>
</item>
<item>
......@@ -71,37 +69,6 @@
<key> <string>values</string> </key>
<value>
<dictionary>
<item>
<key> <string>columns</string> </key>
<value>
<list>
<tuple>
<string>id</string>
<string>Reference</string>
</tuple>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>resource_title</string>
<string>Resource</string>
</tuple>
<tuple>
<string>creation_date</string>
<string>Creation Date</string>
</tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>State</string>
</tuple>
<tuple>
<string>translated_simulation_state_title</string>
<string>Installation State</string>
</tuple>
</list>
</value>
</item>
<item>
<key> <string>field_id</string> </key>
<value> <string>my_view_mode_listbox_business_configuration</string> </value>
......
bt5/erp5_configurator_ebusiness_lotse/PathTemplateItem/business_configuration_module/ebusiness_lotse_configuration.xml
View file @ 785fa5e8
......@@ -88,8 +88,8 @@
<key> <string>categories</string> </key>
<value>
<tuple>
<string>current_state/workflow_module/ebusiness_lotse_configuration_workflow/63</string>
<string>resource/workflow_module/ebusiness_lotse_configuration_workflow</string>
<string>current_state/workflow_module/ebusiness_lotse_configuration_workflow/63</string>
</tuple>
</value>
</item>
......
bt5/erp5_configurator_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDocConfigurationWorkflow.xml
View file @ 785fa5e8
......@@ -6,22 +6,10 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>testRunMyDocConfigurationWorkflow</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>test.erp5.testRunMyDocConfigurationWorkflow</string> </value>
......@@ -36,37 +24,6 @@
<none/>
</value>
</item>
<item>
<key> <string>text_content_error_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>text_content_warning_message</string> </key>
<value>
<tuple>
<string>W:165, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:166, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:167, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:168, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:169, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:170, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:171, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:172, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:173, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:176, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:177, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:178, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:179, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:180, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:181, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:182, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:183, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
<string>W:184, 0: Bad indentation. Found 5 spaces, expected 4 (bad-indentation)</string>
</tuple>
</value>
</item>
<item>
<key> <string>version</string> </key>
<value> <string>erp5</string> </value>
......@@ -74,28 +31,13 @@
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
......@@ -108,7 +50,7 @@
<item>
<key> <string>component_validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
......@@ -117,7 +59,7 @@
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
......
bt5/erp5_configurator_standard/PathTemplateItem/business_configuration_module/default_standard_configuration.xml
View file @ 785fa5e8
......@@ -184,6 +184,10 @@
<none/>
</value>
</item>
<item>
<key> <string>last_id</string> </key>
<value> <string>3</string> </value>
</item>
<item>
<key> <string>modification_date</string> </key>
<value>
......
bt5/erp5_configurator_standard/TestTemplateItem/portal_components/test.erp5.testStandardConfigurationWorkflow.xml
View file @ 785fa5e8
......@@ -6,22 +6,10 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>testStandardConfigurationWorkflow</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>test.erp5.testStandardConfigurationWorkflow</string> </value>
......@@ -36,22 +24,6 @@
<none/>
</value>
</item>
<item>
<key> <string>text_content_error_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>text_content_warning_message</string> </key>
<value>
<tuple>
<string>W:562, 4: Unreachable code (unreachable)</string>
<string>W:923, 4: Unused variable \'sale_packing_list\' (unused-variable)</string>
<string>W:963, 4: Unused variable \'business_process\' (unused-variable)</string>
</tuple>
</value>
</item>
<item>
<key> <string>version</string> </key>
<value> <string>erp5</string> </value>
......@@ -59,28 +31,13 @@
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
......@@ -93,7 +50,7 @@
<item>
<key> <string>component_validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
......@@ -102,7 +59,7 @@
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
......
bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.xml
View file @ 785fa5e8
......@@ -6,22 +6,10 @@
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_recorded_property_dict</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>default_reference</string> </key>
<value> <string>testUNGConfigurationWorkflow</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>test.erp5.testUNGConfigurationWorkflow</string> </value>
......@@ -36,18 +24,6 @@
<none/>
</value>
</item>
<item>
<key> <string>text_content_error_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>text_content_warning_message</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>version</string> </key>
<value> <string>erp5</string> </value>
......@@ -55,28 +31,13 @@
<item>
<key> <string>workflow_history</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
......@@ -89,7 +50,7 @@
<item>
<key> <string>component_validation_workflow</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
</dictionary>
......@@ -98,7 +59,7 @@
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="WorkflowHistoryList" module="Products.ERP5Type.patches.WorkflowTool"/>
</pickle>
......
bt5/erp5_graph_editor/SkinTemplateItem/portal_skins/erp5_graph_editor/dream_graph_editor/jsplumb/jsplumb.css.xml
View file @ 785fa5e8
......@@ -10,10 +10,6 @@
<key> <string>_Cacheable__manager_id</string> </key>
<value> <string>http_cache</string> </value>
</item>
<item>
<key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts48641303.03</string> </value>
</item>
<item>
<key> <string>__name__</string> </key>
<value> <string>jsplumb.css</string> </value>
......@@ -26,10 +22,6 @@
<key> <string>precondition</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>size</string> </key>
<value> <int>2380</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
......
bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebPageModule_viewWebPageList/listbox.xml
View file @ 785fa5e8
......@@ -169,10 +169,6 @@
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
<tuple>
<string>portal_type</string>
<string>Type</string>
</tuple>
</list>
</value>
</item>
......@@ -208,10 +204,6 @@
<string>int_index</string>
<string>Index</string>
</tuple>
<tuple>
<string>portal_type</string>
<string>Type</string>
</tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>State</string>
......
bt5/erp5_workflow/PortalTypeTemplateItem/portal_types/Workflow%20Module.xml
View file @ 785fa5e8
......@@ -42,12 +42,6 @@
<value> <string>Folders allow to store a large number of documents (1,000,000 should not\n
be a problem).</string> </value>
</item>
<item>
<key> <string>erp5workflow_list</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>factory</string> </key>
<value> <string>addFolder</string> </value>
......@@ -70,15 +64,7 @@ be a problem).</string> </value>
</item>
<item>
<key> <string>init_script</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>permission</string> </key>
<value>
<none/>
</value>
<value> <string></string> </value>
</item>
<item>
<key> <string>title</string> </key>
......@@ -88,18 +74,6 @@ be a problem).</string> </value>
<key> <string>type_class</string> </key>
<value> <string>Folder</string> </value>
</item>
<item>
<key> <string>type_interface</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>type_mixin</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary>
</pickle>
</record>
......
product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/BaseType_view.xml
View file @ 785fa5e8
......@@ -106,7 +106,6 @@
<string>my_type_property_sheet_list</string>
<string>my_type_base_category_list</string>
<string>my_type_icon</string>
<string>my_type_workflow_list</string>
</list>
</value>
</item>
......
product/Formulator/StandardFields.py
View file @ 785fa5e8
......@@ -184,10 +184,6 @@ class DateTimeField(ZMIField):
if REQUEST.form['subfield_%s_%s' % (key, 'year')]:
return None
gmt_timezones = [('GMT%s' %zone, 'GMT%s' %zone,) for zone in range(-12, 0)]\
+ [('GMT', 'GMT',),] \
+ [('GMT+%s' %zone, 'GMT+%s' %zone,) for zone in range(1, 13)]
def create_datetime_text_sub_form():
sub_form = BasicForm()
......@@ -238,7 +234,7 @@ def create_datetime_text_sub_form():
title = "Timezone",
required = 0,
default = 'GMT',
items = gmt_timezones,
items = Widget.gmt_timezones,
size = 1)
sub_form.add_fields([hour, minute, ampm, timezone], "time")
return sub_form
......@@ -296,7 +292,7 @@ def create_datetime_list_sub_form():
title = "Timezone",
required = 0,
default = 'GMT',
items = gmt_timezones,
items = Widget.gmt_timezones,
size = 1)
sub_form.add_group("time")
......
product/Formulator/Widget.py
View file @ 785fa5e8
......@@ -1296,6 +1296,8 @@ class MultiCheckBoxWidget(MultiItemsWidget):
MultiCheckBoxWidgetInstance = MultiCheckBoxWidget()
gmt_timezones = [(x, x) for x in sorted(set(Timezones()))]
class DateTimeWidget(Widget):
"""
Added support for key in every call to render_sub_field
......@@ -1377,6 +1379,15 @@ class DateTimeWidget(Widget):
("list", "list")],
size=1)
default_timezone = fields.ListField('default_timezone',
title="Default Timezone",
description=(
"The default timezone display when inputing a new date"),
default="GMT",
items=gmt_timezones,
required=1,
size=1)
input_order = fields.ListField('input_order',
title="Input order",
description=(
......@@ -1404,8 +1415,8 @@ class DateTimeWidget(Widget):
property_names = Widget.property_names +\
['default_now', 'date_separator', 'time_separator',
'input_style', 'input_order', 'date_only',
'ampm_time_style', 'timezone_style', 'hide_day',
'hidden_day_is_last_day']
'ampm_time_style', 'timezone_style', 'default_timezone',
'hide_day', 'hidden_day_is_last_day']
def getInputOrder(self, field):
input_order = field.get_value('input_order')
......@@ -1463,7 +1474,7 @@ class DateTimeWidget(Widget):
hour = None
minute = None
ampm = None
timezone = None
timezone = field.get_value("default_timezone")
if isinstance(value, DateTime):
year = "%04d" % value.year()
month = "%02d" % value.month()
......
product/Formulator/tests/testSerializeForm.py
View file @ 785fa5e8
......@@ -280,6 +280,7 @@ class SerializeTestCase(unittest.TestCase):
request.update(default_values)
request.update( {'field_input_style': 'list',
'field_input_order': 'mdy',
'field_default_timezone': 'GMT',
'field_date_only': '',
'field_css_class': 'test_css',
'field_time_separator': '$',
......
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