Commit 2a3f4c11 authored by Gabriel Monnerat's avatar Gabriel Monnerat

erp5_web_renderjs_ui: Extend code to support submit dialog with custom method

parent 8e39f2fe
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
}); });
} }
function submitDialog(is_updating) { function submitDialog(is_updating, custom_dialog_method) {
var gadget = this, var gadget = this,
button_container = button_container =
gadget.element.querySelector('.dialog_button_container'), gadget.element.querySelector('.dialog_button_container'),
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
} }
} }
// ERP5 expects target Script name in dialog_method field // ERP5 expects target Script name in dialog_method field
data.dialog_method = gadget.state.form_definition.action; data.dialog_method = custom_dialog_method || gadget.state.form_definition.action;
// For Update Action - override the default value from "action" // For Update Action - override the default value from "action"
if (is_updating) { if (is_updating) {
data.dialog_method = gadget.state.form_definition.update_action; data.dialog_method = gadget.state.form_definition.update_action;
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
if (gadget.state.redirect_to_parent) { if (gadget.state.redirect_to_parent) {
return gadget.redirect({command: 'history_previous'}); return gadget.redirect({command: 'history_previous'});
} }
console.log('COSUCOUS', result);
if ((gadget.state.jio_key === result.jio_key) && if ((gadget.state.jio_key === result.jio_key) &&
(!result.view)) { (!result.view)) {
// don't update navigation history when not really redirecting // don't update navigation history when not really redirecting
...@@ -107,7 +106,6 @@ ...@@ -107,7 +106,6 @@
} }
} }
console.log('lets redirect', command, result.jio_key, result.view);
// forced document change thus we update history // forced document change thus we update history
return gadget.redirect({ return gadget.redirect({
command: command, command: command,
...@@ -131,6 +129,10 @@ ...@@ -131,6 +129,10 @@
} }
function submitDialogWithCustomDialogMethod(param_list) {
return submitDialog.apply(this, [false, param_list[0]]);
}
var gadget_klass = rJS(window), var gadget_klass = rJS(window),
dialog_button_source = gadget_klass.__template_element dialog_button_source = gadget_klass.__template_element
.getElementById("dialog-button-template") .getElementById("dialog-button-template")
...@@ -153,6 +155,8 @@ ...@@ -153,6 +155,8 @@
.declareAcquiredMethod("translate", "translate") .declareAcquiredMethod("translate", "translate")
.declareAcquiredMethod("translateHtml", "translateHtml") .declareAcquiredMethod("translateHtml", "translateHtml")
.declareAcquiredMethod("submitContent", "submitContent") .declareAcquiredMethod("submitContent", "submitContent")
.allowPublicAcquisition("submitDialogWithCustomDialogMethod",
submitDialogWithCustomDialogMethod)
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// Proxy methods to the child gadget // Proxy methods to the child gadget
......
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