Skip to content

erp5
erp5
Commit cd2926a1 authored by iv's avatar iv
Browse files
Options

ERP5Workflow: fix automatic_update value on some configuration workflows 

+ raise explicitly when history has empty transition
(this happens when there automatic_update is not true)
parent 8f9421fe
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 6 deletions
bt5/erp5_configurator_ebusiness_lotse/PathTemplateItem/workflow_module/ebusiness_lotse_configuration_workflow/variable_actor.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_ebusiness_lotse/PathTemplateItem/workflow_module/ebusiness_lotse_configuration_workflow/variable_client_id.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_ebusiness_lotse/PathTemplateItem/workflow_module/ebusiness_lotse_configuration_workflow/variable_comment.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_ebusiness_lotse/PathTemplateItem/workflow_module/ebusiness_lotse_configuration_workflow/variable_configuration_save_url.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_ebusiness_lotse/PathTemplateItem/workflow_module/ebusiness_lotse_configuration_workflow/variable_displayed.xml
View file @ cd2926a1
...@@ -36,6 +36,10 @@ ...@@ -36,6 +36,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_ebusiness_lotse/PathTemplateItem/workflow_module/ebusiness_lotse_configuration_workflow/variable_error_message.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_ebusiness_lotse/PathTemplateItem/workflow_module/ebusiness_lotse_configuration_workflow/variable_time.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_ebusiness_lotse/PathTemplateItem/workflow_module/ebusiness_lotse_configuration_workflow/variable_transition.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/variable_actor.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/variable_client_id.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/variable_comment.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/variable_configuration_save_url.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/variable_displayed.xml
View file @ cd2926a1
...@@ -36,6 +36,10 @@ ...@@ -36,6 +36,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/variable_error_message.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/variable_time.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_run_my_doc/PathTemplateItem/workflow_module/run_my_doc_configuration_workflow/variable_transition.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/variable_actor.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/variable_client_id.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/variable_comment.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/variable_configuration_save_url.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/variable_displayed.xml
View file @ cd2926a1
...@@ -36,6 +36,10 @@ ...@@ -36,6 +36,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/variable_error_message.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_consulting_workflow/variable_transition.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/variable_actor.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/variable_client_id.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/variable_comment.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/variable_configuration_save_url.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/variable_displayed.xml
View file @ cd2926a1
...@@ -36,6 +36,10 @@ ...@@ -36,6 +36,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/variable_error_message.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/variable_time.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_configurator_standard/PathTemplateItem/workflow_module/erp5_standard_workflow/variable_transition.xml
View file @ cd2926a1
...@@ -34,6 +34,10 @@ ...@@ -34,6 +34,10 @@
<tuple/> <tuple/>
</value> </value>
</item> </item>
<item>
<key> <string>automatic_update</string> </key>
<value> <int>1</int> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
bt5/erp5_upgrader/bt/test_dependency_list
View file @ cd2926a1
erp5_full_text_mroonga_catalog erp5_full_text_mroonga_catalog
erp5_base erp5_base
erp5_upgrader_test erp5_upgrader_test
\ No newline at end of file erp5_workflow
product/ERP5Configurator/Document/BusinessConfiguration.py
View file @ cd2926a1
...@@ -241,16 +241,20 @@ class BusinessConfiguration(Item): ...@@ -241,16 +241,20 @@ class BusinessConfiguration(Item):
""" Render previous form using workflow history. """ """ Render previous form using workflow history. """
workflow_history = self.getCurrentStateValue().getWorkflowHistory(self, remove_undo=1) workflow_history = self.getCurrentStateValue().getWorkflowHistory(self, remove_undo=1)
workflow_history.reverse() workflow_history.reverse()
for wh in workflow_history: for history_line in workflow_history:
## go one step back ## go one step back
current_state = self.getCurrentStateValue() current_state = self.getCurrentStateValue()
current_state.undoTransition(self) current_state.undoTransition(self)
transition = self.unrestrictedTraverse(wh['transition']) if not history_line['transition']:
conf_save = self.unrestrictedTraverse(wh['configuration_save_url']) raise ValueError("Empty URL for transition in workflow history.")
transition = self.unrestrictedTraverse(history_line['transition'])
configuration_save = self.unrestrictedTraverse(
history_line['configuration_save_url']
)
## check if this transition can be shown to user ... ## check if this transition can be shown to user ...
if transition._checkPermission(self) and \ if transition._checkPermission(self) and \
transition.getTransitionFormId() is not None: transition.getTransitionFormId() is not None:
return self._displayNextForm(context=conf_save, transition=transition) return self._displayNextForm(context=configuration_save, transition=transition)
security.declarePrivate('_validateNextForm') security.declarePrivate('_validateNextForm')
def _validateNextForm(self, **kw): def _validateNextForm(self, **kw):
......
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