Commit a5aec50a authored by Romain Courteaud's avatar Romain Courteaud

Revert "[erp5_web_renderjs_ui] Actions and workflow transitions were mixed"

This reverts commit e1fa7611.
The fix was already provided by c1b8fa1a
parent 472d4558
......@@ -80,8 +80,8 @@
return gadget.jio_getAttachment(options.jio_key, "links")
.push(function (result) {
erp5_document = result;
action_list = asArray(erp5_document._links.action_workflow);
transition_list = asArray(erp5_document._links.action_object_jio_action)
transition_list = asArray(erp5_document._links.action_workflow);
action_list = asArray(erp5_document._links.action_object_jio_action)
.concat(asArray(erp5_document._links.action_object_clone_action));
return RSVP.all([
......
......@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>963.11788.48702.26146</string> </value>
<value> <string>963.3161.27188.50653</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
<float>1510827077.3</float>
<float>1509097440.1</float>
<string>UTC</string>
</tuple>
</state>
......
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