Pārlūkot izejas kodu

Merge branch 'master' into develop

version-14
Nabin Hait pirms 7 gadiem
vecāks
revīzija
c2d5155138
2 mainītis faili ar 11 papildinājumiem un 1 dzēšanām
  1. +1
    -1
      frappe/__init__.py
  2. +10
    -0
      frappe/public/js/frappe/model/sync.js

+ 1
- 1
frappe/__init__.py Parādīt failu

@@ -15,7 +15,7 @@ from past.builtins import cmp
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template

__version__ = '10.1.8'
__version__ = '10.1.9'
__title__ = "Frappe Framework"

local = Local()


+ 10
- 0
frappe/public/js/frappe/model/sync.js Parādīt failu

@@ -122,7 +122,17 @@ $.extend(frappe.model, {

// remove extra rows
if (local_doc[fieldname].length > doc[fieldname].length) {
for (let i = doc[fieldname].length; i < local_doc[fieldname].length; i++) {

// clear from local
let d = local_doc[fieldname][i];
if (locals[d.doctype] && locals[d.doctype][d.name]) {
delete locals[d.doctype][d.name];
}
}
local_doc[fieldname].length = doc[fieldname].length;


}
} else {
// literal


Notiek ielāde…
Atcelt
Saglabāt