浏览代码

[minor] correct flag setting

version-14
Rushabh Mehta 8 年前
父节点
当前提交
0c19319788
共有 2 个文件被更改,包括 2 次插入3 次删除
  1. +0
    -1
      frappe/model/document.py
  2. +2
    -2
      frappe/modules/import_file.py

+ 0
- 1
frappe/model/document.py 查看文件

@@ -4,7 +4,6 @@
from __future__ import unicode_literals, print_function from __future__ import unicode_literals, print_function
import frappe import frappe
import time import time
import redis
from frappe import _, msgprint from frappe import _, msgprint
from frappe.utils import flt, cstr, now, get_datetime_str, file_lock from frappe.utils import flt, cstr, now, get_datetime_str, file_lock
from frappe.utils.background_jobs import enqueue from frappe.utils.background_jobs import enqueue


+ 2
- 2
frappe/modules/import_file.py 查看文件

@@ -34,7 +34,6 @@ def get_file_path(module, dt, dn):


def import_file_by_path(path, force=False, data_import=False, pre_process=None, ignore_version=None, def import_file_by_path(path, force=False, data_import=False, pre_process=None, ignore_version=None,
reset_permissions=False): reset_permissions=False):
frappe.flags.in_import = True
try: try:
docs = read_doc_from_file(path) docs = read_doc_from_file(path)
except IOError: except IOError:
@@ -54,8 +53,10 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None,


original_modified = doc.get("modified") original_modified = doc.get("modified")


frappe.flags.in_import = True
import_doc(doc, force=force, data_import=data_import, pre_process=pre_process, import_doc(doc, force=force, data_import=data_import, pre_process=pre_process,
ignore_version=ignore_version, reset_permissions=reset_permissions) ignore_version=ignore_version, reset_permissions=reset_permissions)
frappe.flags.in_import = False


if original_modified: if original_modified:
# since there is a new timestamp on the file, update timestamp in # since there is a new timestamp on the file, update timestamp in
@@ -67,7 +68,6 @@ def import_file_by_path(path, force=False, data_import=False, pre_process=None,
(doc['doctype'], '%s', '%s'), (doc['doctype'], '%s', '%s'),
(original_modified, doc['name'])) (original_modified, doc['name']))


frappe.flags.in_import = False
return True return True


def read_doc_from_file(path): def read_doc_from_file(path):


正在加载...
取消
保存