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

Make data import tool async WIP

Browse source
This commit is contained in:
Pratik Vyas 2015-07-17 10:20:45 +05:30
parent f8bc9877b6
commit bd2cad08bc
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
frappe/core/page/data_import_tool/importer.py
View file

@ -5,6 +5,7 @@ from __future__ import unicode_literals
import frappe, json
import frappe.permissions
import frappe.async
from frappe import _
@ -14,7 +15,7 @@ from frappe.utils.dateutils import parse_date
from frappe.utils import cint, cstr, flt
from frappe.core.page.data_import_tool.data_import_tool import get_data_keys
@frappe.whitelist()
@frappe.async.handler
def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, overwrite=None,
ignore_links=False, pre_process=None):
"""upload data"""

6
frappe/public/js/frappe/socket.js
View file

@ -85,13 +85,13 @@ frappe.socket = {
}
if(data) {
var opts = frappe.socket.open_tasks[data.task_id];
if(opts[method]) opts[method](data.message);
if(opts[method]) opts[method](data);
}
if(opts.always) {
opts.always(data.message);
opts.always(data);
}
if(data.status_code && status_code > 400 && opts.error) {
opts.error(data.message);
opts.error(data);
return;
}