diff --git a/core/page/data_import_tool/data_import_tool.js b/core/page/data_import_tool/data_import_tool.js index 073a6e36b8..46a6c57e29 100644 --- a/core/page/data_import_tool/data_import_tool.js +++ b/core/page/data_import_tool/data_import_tool.js @@ -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 = $('
').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'); } }); diff --git a/core/page/data_import_tool/data_import_tool.py b/core/page/data_import_tool/data_import_tool.py index 5bc0a8acc5..56617f44a1 100644 --- a/core/page/data_import_tool/data_import_tool.py +++ b/core/page/data_import_tool/data_import_tool.py @@ -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,