Skip to content

erp5-Boxiang
erp5-Boxiang
Commit 1100aa14 authored by Tomáš Peterka's avatar Tomáš Peterka Committed by Tomáš Peterka
Browse files
Options

[renderjs_ui+json] Dialog form handles HTTP responses 202-399

parent 3bf9d9d1
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 7 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.html
View file @ 1100aa14
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
data-i18n=Document was not saved! Resubmit when you are online or the document accessible data-i18n=Document was not saved! Resubmit when you are online or the document accessible
data-i18n=Encountered an unknown error. Try to resubmit data-i18n=Encountered an unknown error. Try to resubmit
data-i18n=Data received data-i18n=Data received
data-i18n=Action succeeded
--> -->
<head> <head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_html.xml
View file @ 1100aa14
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>960.56020.52206.40328</string> </value> <value> <string>962.14191.38290.31931</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1505912615.0</float> <float>1506093694.63</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.js
View file @ 1100aa14
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
// ignore options.editable because dialog is always editable // ignore options.editable because dialog is always editable
erp5_document: options.erp5_document, erp5_document: options.erp5_document,
form_definition: options.form_definition, form_definition: options.form_definition,
erp5_form: options.erp5_form || {}, erp5_form: options.erp5_form || {}
// ignore global editable state (be always editable) // ignore global editable state (be always editable)
}); });
}) })
...@@ -153,7 +153,8 @@ ...@@ -153,7 +153,8 @@
if (attachment.target.responseType !== "blob") { if (attachment.target.responseType !== "blob") {
attachment_data = new Blob( attachment_data = new Blob(
[attachment.target.response], [attachment.target.response],
{type: attachment.target.getResponseHeader("Content-Type")}); {type: attachment.target.getResponseHeader("Content-Type")}
);
} }
a_tag.style = "display: none"; a_tag.style = "display: none";
a_tag.href = URL.createObjectURL(attachment_data); a_tag.href = URL.createObjectURL(attachment_data);
...@@ -227,7 +228,9 @@ ...@@ -227,7 +228,9 @@
// here we figure out where to go after form submit - indicated // here we figure out where to go after form submit - indicated
// by X-Location HTTP header placed by Base_redirect script // by X-Location HTTP header placed by Base_redirect script
var jio_key = new URI( var jio_key = new URI(
attachment.target.getResponseHeader("X-Location")).segment(2); attachment.target.getResponseHeader("X-Location")
).segment(2);
if (redirect_to_parent) { if (redirect_to_parent) {
return form_gadget.redirect({command: 'history_previous'}); return form_gadget.redirect({command: 'history_previous'});
} }
...@@ -271,6 +274,35 @@ ...@@ -271,6 +274,35 @@
return form_gadget.displayFormulatorValidationError(JSON.parse(response_text.target.result)); return form_gadget.displayFormulatorValidationError(JSON.parse(response_text.target.result));
}); });
} }
// response status > 200 (e.g. 202 "Accepted" or 204 "No Content")
// mean sucessful execution of an action but does not carry any data
// XMLHttpRequest automatically inserts Content-Type="text/xml" thus
// we cannot test based on that
if (attachment.target.response.size === 0 &&
attachment.target.status > 200 &&
attachment.target.status < 400) {
return new RSVP.Queue()
.push(function () {
return form_gadget.notifySubmitted({
"message": "Action succeeded",
"status": "success"
});
})
.push(function () {
if (redirect_to_parent) {
return form_gadget.redirect({command: 'history_previous'});
}
return form_gadget.redirect({
command: 'change',
options: {
"jio_key": form_gadget.state.jio_key,
"view": "view",
"page": undefined
// do not mingle with editable because it isn't necessary
}
});
});
}
// any other attachment type we force to download because it is most // any other attachment type we force to download because it is most
// likely product of export/report (thus PDF, ODT ...) // likely product of export/report (thus PDF, ODT ...)
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_dialog_js.xml
View file @ 1100aa14
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>962.15391.22775.52445</string> </value> <value> <string>962.17207.35280.11400</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1506008825.18</float> <float>1506093724.9</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7