Ver a proveniência

Merge pull request #914 from nabinhait/hotfix

Block parallel ajax while saving
version-14
Nabin Hait há 10 anos
ascendente
cometimento
a0e17a80b1
2 ficheiros alterados com 12 adições e 0 eliminações
  1. +10
    -0
      frappe/public/js/frappe/form/save.js
  2. +2
    -0
      frappe/public/js/frappe/request.js

+ 10
- 0
frappe/public/js/frappe/form/save.js Ver ficheiro

@@ -114,6 +114,13 @@ frappe.ui.form.save = function(frm, action, callback, btn) {
// btn: btn
// }
$(opts.btn).prop("disabled", true);

if(frappe.ui.form.is_saving) {
msgprint(__("Already saving. Please wait a few moments."));
throw "saving";
}
frappe.ui.form.is_saving = true;

return frappe.call({
freeze: true,
method: opts.method,
@@ -121,6 +128,9 @@ frappe.ui.form.save = function(frm, action, callback, btn) {
callback: function(r) {
$(opts.btn).prop("disabled", false);
opts.callback && opts.callback(r);
},
always: function() {
frappe.ui.form.is_saving = false;
}
})
};


+ 2
- 0
frappe/public/js/frappe/request.js Ver ficheiro

@@ -29,6 +29,7 @@ frappe.call = function(opts) {
args: args,
success: opts.callback,
error: opts.error,
always: opts.always,
btn: opts.btn,
freeze: opts.freeze,
show_spinner: !opts.no_spinner,
@@ -124,6 +125,7 @@ frappe.request.call = function(opts) {
data = JSON.parse(data.responseText);
}
frappe.request.cleanup(opts, data);
if(opts.always) opts.always(data);
})
.done(function(data, textStatus, xhr) {
var status_code_handler = statusCode[xhr.statusCode().status];


Carregando…
Cancelar
Guardar