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

fixes in data import tool

Browse source
This commit is contained in:
Anand Doshi 2012-11-27 17:53:54 +05:30
parent 0647142219
commit ea03b59b45
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/page/data_import_tool/data_import_tool.js
View file

@ -107,7 +107,8 @@ wn.pages['data-import-tool'].onload = function(wrapper) {
// replace links if error has occured
if(r.exc || r.error) {
r.messages = $.map(r.messages, function(v) {
var msg = v.replace("Inserted", "Valid").split("<");
var msg = v.replace("Inserted", "Valid")
.replace("Updated", "Valid").split("<");
if (msg.length > 1) {
v = msg[0] + (msg[1].split(">").slice(-1)[0]);
} else {
@ -127,12 +128,12 @@ wn.pages['data-import-tool'].onload = function(wrapper) {
var $p = $('<p>').html(v).appendTo('#dit-output');
if(v.substr(0,5)=='Error') {
$p.css('color', 'red');
}
if(v.substr(0,8)=='Inserted' || v.substr(0,5)=='Valid') {
} else if(v.substr(0,8)=='Inserted') {
$p.css('color', 'green');
}
if(v.substr(0,7)=='Updated') {
} else if(v.substr(0,7)=='Updated') {
$p.css('color', 'green');
} else if(v.substr(0,5)=='Valid') {
$p.css('color', '#777');
}
});

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

@ -288,7 +288,8 @@ def import_doc(d, doctype, overwrite, row_idx):
if overwrite:
doclist = webnotes.model.doc.get(doctype, d['name'])
doclist[0].fields.update(d)
ModelWrapper(doclist).save()
model_wrapper = ModelWrapper(doclist)
model_wrapper.save()
return 'Updated row (#%d) %s' % (row_idx, getlink(doctype, d['name']))
else:
return 'Ignored row (#%d) %s (exists)' % (row_idx,