Преглед изворни кода

Merge pull request #15580 from surajshetty3416/fix-datetime-control

version-14
Suraj Shetty пре 3 година
committed by GitHub
родитељ
комит
4b5e67e165
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 измењених фајлова са 8 додато и 8 уклоњено
  1. +7
    -7
      frappe/public/js/frappe/form/controls/base_control.js
  2. +1
    -1
      frappe/public/js/frappe/form/form.js

+ 7
- 7
frappe/public/js/frappe/form/controls/base_control.js Прегледај датотеку

@@ -148,8 +148,9 @@ frappe.ui.form.Control = class BaseControl {
return this.doc[this.df.fieldname]; return this.doc[this.df.fieldname];
} }
} }
set_value(value) {
return this.validate_and_set_in_model(value);

set_value(value, force_set_value=false) {
return this.validate_and_set_in_model(value, null, force_set_value);
} }
parse_validate_and_set_in_model(value, e) { parse_validate_and_set_in_model(value, e) {
if(this.parse) { if(this.parse) {
@@ -157,12 +158,11 @@ frappe.ui.form.Control = class BaseControl {
} }
return this.validate_and_set_in_model(value, e); return this.validate_and_set_in_model(value, e);
} }
validate_and_set_in_model(value, e) {
var me = this;
let force_value_set = (this.doc && this.doc.__run_link_triggers);
let is_value_same = (this.get_model_value() === value);
validate_and_set_in_model(value, e, force_set_value=false) {
const me = this;
const is_value_same = (this.get_model_value() === value);


if (this.inside_change_event || (!force_value_set && is_value_same)) {
if (this.inside_change_event || (is_value_same && !force_set_value)) {
return Promise.resolve(); return Promise.resolve();
} }




+ 1
- 1
frappe/public/js/frappe/form/form.js Прегледај датотеку

@@ -983,7 +983,7 @@ frappe.ui.form.Form = class FrappeForm {
$.each(this.fields_dict, function(fieldname, field) { $.each(this.fields_dict, function(fieldname, field) {
if (field.df.fieldtype=="Link" && this.doc[fieldname]) { if (field.df.fieldtype=="Link" && this.doc[fieldname]) {
// triggers add fetch, sets value in model and runs triggers // triggers add fetch, sets value in model and runs triggers
field.set_value(this.doc[fieldname]);
field.set_value(this.doc[fieldname], true);
} }
}); });




Loading…
Откажи
Сачувај