vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Rename validated to frappe.validated

Browse source
This commit is contained in:
Faris Ansari 2017-05-19 18:31:45 +05:30
parent 2ff26d7798
commit e243d76244
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/custom/doctype/property_setter/property_setter.js
View file

@ -5,7 +5,7 @@ $.extend(cur_frm.cscript, {
validate: function(doc) {
if(doc.property_type=='Check' && !in_list(['0','1'], doc.value)) {
frappe.msgprint(__('Value for a check field can be either 0 or 1'));
validated = false;
frappe.validated = false;
}
}
})

14
frappe/public/js/legacy/form.js
View file

@ -690,7 +690,7 @@ _f.Frm.prototype.reload_doc = function() {
}
}
var validated;
frappe.validated = 0;
_f.Frm.prototype.save = function(save_action, callback, btn, on_error) {
btn && $(btn).prop("disabled", true);
$(document.activeElement).blur();
@ -727,12 +727,12 @@ _f.Frm.prototype._save = function(save_action, callback, btn, on_error) {
if(save_action != "Update") {
// validate
validated = true;
frappe.validated = true;
$.when(this.script_manager.trigger("validate"), this.script_manager.trigger("before_save"))
.done(function() {
// done is called after all ajaxes in validate & before_save are completed :)
if(!validated) {
if(!frappe.validated) {
btn && $(btn).prop("disabled", false);
if(on_error) {
on_error();
@ -753,9 +753,9 @@ _f.Frm.prototype.savesubmit = function(btn, callback, on_error) {
var me = this;
this.validate_form_action("Submit");
frappe.confirm(__("Permanently Submit {0}?", [this.docname]), function() {
validated = true;
frappe.validated = true;
me.script_manager.trigger("before_submit").done(function() {
if(!validated) {
if(!frappe.validated) {
if(on_error)
on_error();
return;
@ -776,9 +776,9 @@ _f.Frm.prototype.savecancel = function(btn, callback, on_error) {
var me = this;
this.validate_form_action('Cancel');
frappe.confirm(__("Permanently Cancel {0}?", [this.docname]), function() {
validated = true;
frappe.validated = true;
me.script_manager.trigger("before_cancel").done(function() {
if(!validated) {
if(!frappe.validated) {
if(on_error)
on_error();
return;