From becaeaf46d9487cb9348fde3131373789c8060e0 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Wed, 5 Oct 2016 12:48:28 +0000
Subject: [PATCH] [erp5_web_renderjs_ui] Do not try to submit if the form
doesn't have action
---
...js_gadget_erp5_pt_form_view_editable_js.js | 31 ++++++++++++-------
...s_gadget_erp5_pt_form_view_editable_js.xml | 4 +--
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.js b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.js
index 81c2a1b925..383a507436 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.js
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.js
@@ -29,8 +29,17 @@
editable: options.editable,
erp5_document: options.erp5_document,
form_definition: options.form_definition,
- erp5_form: options.erp5_form || {}
+ erp5_form: options.erp5_form || {},
+ new_content_action: false,
+ delete_action: false,
+ save_action: false
};
+
+ if (options.erp5_document._embedded._view._actions !== undefined) {
+ if (options.erp5_document._embedded._view._actions.put !== undefined) {
+ state_dict.save_action = true;
+ }
+ }
return this.changeState(state_dict);
})
@@ -52,14 +61,7 @@
// render the header
.push(function () {
var new_content_action = form_gadget.state.erp5_document._links.action_object_new_content_action,
- delete_action = form_gadget.state.erp5_document._links.action_object_delete_action,
- save_action = false;
-
- if (form_gadget.state.erp5_document._embedded._view._actions !== undefined) {
- if (form_gadget.state.erp5_document._embedded._view._actions.put !== undefined) {
- save_action = true;
- }
- }
+ delete_action = form_gadget.state.erp5_document._links.action_object_delete_action;
if (new_content_action !== undefined) {
new_content_action = form_gadget.getUrlFor({command: 'change', options: {view: new_content_action.href, editable: true}});
@@ -78,7 +80,6 @@
new_content_action,
form_gadget.getUrlFor({command: 'history_previous'}),
delete_action,
- save_action,
calculatePageTitle(form_gadget, form_gadget.state.erp5_document)
]);
})
@@ -90,9 +91,9 @@
selection_url: all_result[3],
delete_url: all_result[4],
cut_url: "",
- page_title: all_result[6]
+ page_title: all_result[5]
};
- if (all_result[5] === true) {
+ if (form_gadget.state.save_action === true) {
header_dict.save_action = true;
}
return form_gadget.updateHeader(header_dict);
@@ -100,6 +101,12 @@
})
.onEvent('submit', function () {
+
+ if (this.state.save_action !== true) {
+ // If not action is defined on form, do nothing
+ return;
+ }
+
var form_gadget = this,
erp5_form,
form_id = this.state.erp5_document._embedded._view.form_id,
diff --git a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.xml b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.xml
index 01e204de00..58c04cca5f 100644
--- a/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.xml
+++ b/bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_view_editable_js.xml
@@ -230,7 +230,7 @@
</item>
<item>
<key> <string>serial</string> </key>
- <value> <string>954.5679.65163.53162</string> </value>
+ <value> <string>954.25820.35404.6229</string> </value>
</item>
<item>
<key> <string>state</string> </key>
@@ -248,7 +248,7 @@
</tuple>
<state>
<tuple>
- <float>1475668916.27</float>
+ <float>1475671542.46</float>
<string>UTC</string>
</tuple>
</state>
--
2.30.9