Commit 204cbcb2 authored by Roque's avatar Roque

erp5_officejs: minor fix in reply post redirect

parent 9232aff1
......@@ -26,7 +26,8 @@
var gadget = this,
child_gadget_url = 'gadget_erp5_pt_form_view_editable.html',
portal_type, parent_portal_type,
parent_relative_url, form_definition, action_type;
parent_relative_url, form_definition,
action_type, custom_code;
return RSVP.Queue()
.push(function () {
return RSVP.all([
......@@ -60,7 +61,8 @@
// custom code will come from configuration side (action form)
if (action_type === "object_jio_js_script") {
if (form_definition.fields_raw_properties.hasOwnProperty("gadget_field_action_js_script")) {
eval(form_definition.fields_raw_properties.gadget_field_action_js_script.values.renderjs_extra[0][0]);
custom_code = form_definition.fields_raw_properties.gadget_field_action_js_script.values.renderjs_extra[0];
eval(custom_code[0]);
}
}
return gadget_utils.createDocument(doc_options);
......@@ -84,6 +86,16 @@
});
}
if (action_reference === "reply") {
return gadget_utils.getFormDefinition(parent_portal_type, action_reference)
.push(function (result) {
form_definition = result;
// custom code will come from configuration side (action form)
if (action_type === "object_jio_js_script") {
if (form_definition.fields_raw_properties.hasOwnProperty("gadget_field_action_js_script")) {
custom_code = form_definition.fields_raw_properties.gadget_field_action_js_script.values.renderjs_extra[0];
eval(custom_code[0]);
}
}
var parent_document, child_document, child_jio_key;
return gadget.jio_get(options.jio_key)
.push(function (result) {
......@@ -109,6 +121,7 @@
is_form_list: false
});
});
});
}
throw "Action " + action_reference + " not implemented yet";
});
......@@ -147,7 +160,8 @@
}
}
return gadget_utils.createDocument(document)
.push(function (jio_key) {
.push(function (id) {
jio_key = id;
return gadget.notifySubmitting();
})
.push(function () {
......
......@@ -269,7 +269,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>975.4605.37710.17527</string> </value>
<value> <string>975.4704.7332.52360</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -287,7 +287,7 @@
</tuple>
<state>
<tuple>
<float>1555418811.51</float>
<float>1555424781.77</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