ソースを参照

provide translations in the background process (#4735)

version-14
Manas Solanki 7年前
committed by Nabin Hait
コミット
d5f970e2b7
2個のファイルの変更6行の追加3行の削除
  1. +1
    -1
      frappe/core/doctype/data_import/data_import.py
  2. +5
    -2
      frappe/core/doctype/data_import/importer.py

+ 1
- 1
frappe/core/doctype/data_import/data_import.py ファイルの表示

@@ -34,7 +34,7 @@ def import_data(data_import):
frappe.publish_realtime("data_import_progress", {"progress": "0",
"data_import": data_import, "reload": True}, user=frappe.session.user)
enqueue(upload, queue='default', timeout=6000, event='data_import',
data_import_doc=data_import, from_data_import="Yes", validate_template=False)
data_import_doc=data_import, from_data_import="Yes", user=frappe.session.user)


def import_doc(path, overwrite=False, ignore_links=False, ignore_insert=False,


+ 5
- 2
frappe/core/doctype/data_import/importer.py ファイルの表示

@@ -34,9 +34,13 @@ def get_data_keys():
@frappe.whitelist()
def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, no_email=True, overwrite=None,
update_only = None, ignore_links=False, pre_process=None, via_console=False, from_data_import="No",
skip_errors = True, data_import_doc=None, validate_template=False):
skip_errors = True, data_import_doc=None, validate_template=False, user=None):
"""upload data"""

# for translations
if user:
frappe.set_user_lang(user)

if data_import_doc and isinstance(data_import_doc, string_types):
data_import_doc = frappe.get_doc("Data Import", data_import_doc)
if data_import_doc and from_data_import == "Yes":
@@ -72,7 +76,6 @@ def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False,
frappe.throw(_("Please do not change the rows above {0}").format(get_data_keys_definition().data_separator))

def check_data_length():
max_rows = 5000
if not data:
frappe.throw(_("No data found in the file. Please reattach the new file with data."))



読み込み中…
キャンセル
保存