Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] [minor] upload callback arguments changed

Browse Source
This commit is contained in:
Anand Doshi 2013-07-25 16:02:15 +05:30
parent 4166c35277
commit 85fa3d2bb9
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/page/voucher_import_tool/voucher_import_tool.js
View File

@ -30,7 +30,7 @@ wn.pages['voucher-import-tool'].onload = function(wrapper) {
args: { args: {
method: "accounts.page.voucher_import_tool.voucher_import_tool.upload" method: "accounts.page.voucher_import_tool.voucher_import_tool.upload"
}, },
callback: function(r) { callback: function(fid, filename, r) {
wrapper.waiting.toggle(false); wrapper.waiting.toggle(false);
$(wrapper).find(".messages").toggle(true).html( $(wrapper).find(".messages").toggle(true).html(
r.join("<div style='margin:4px; border-top:1px solid #aaa;'></div>")) r.join("<div style='margin:4px; border-top:1px solid #aaa;'></div>"))

6
hr/doctype/upload_attendance/upload_attendance.js
View File

@ -52,13 +52,13 @@ erpnext.hr.AttendanceControlPanel = wn.ui.form.Controller.extend({
method: 'hr.doctype.upload_attendance.upload_attendance.upload' method: 'hr.doctype.upload_attendance.upload_attendance.upload'
}, },
sample_url: "e.g. http://example.com/somefile.csv", sample_url: "e.g. http://example.com/somefile.csv",
callback: function(r) { callback: function(fid, filename, r) {
var $log_wrapper = $(cur_frm.fields_dict.import_log.wrapper).empty(); var $log_wrapper = $(cur_frm.fields_dict.import_log.wrapper).empty();
if(!r.messages) r.messages = []; if(!r.messages) r.messages = [];
// replace links if error has occured // replace links if error has occured
if(r.exc || r.error) { if(r.exc || r.error) {
r.messages = $.map(r.messages, function(v) { r.messages = $.map(r.message.messages, function(v) {
var msg = v.replace("Inserted", "Valid") var msg = v.replace("Inserted", "Valid")
.replace("Updated", "Valid").split("<"); .replace("Updated", "Valid").split("<");
if (msg.length > 1) { if (msg.length > 1) {
@ -73,7 +73,7 @@ erpnext.hr.AttendanceControlPanel = wn.ui.form.Controller.extend({
.concat(r.messages) .concat(r.messages)
} else { } else {
r.messages = ["<h4 style='color:green'>Import Successful!</h4>"]. r.messages = ["<h4 style='color:green'>Import Successful!</h4>"].
concat(r.messages) concat(r.message.messages)
} }
$.each(r.messages, function(i, v) { $.each(r.messages, function(i, v) {

4
stock/doctype/stock_reconciliation/stock_reconciliation.js
View File

@ -108,8 +108,8 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
method: 'stock.doctype.stock_reconciliation.stock_reconciliation.upload' method: 'stock.doctype.stock_reconciliation.stock_reconciliation.upload'
}, },
sample_url: "e.g. http://example.com/somefile.csv", sample_url: "e.g. http://example.com/somefile.csv",
callback: function(r) { callback: function(fid, filename, r) {
me.frm.set_value("reconciliation_json", JSON.stringify(r)); me.frm.set_value("reconciliation_json", JSON.stringify(r.message));
me.show_reconciliation_data(); me.show_reconciliation_data();
me.frm.save(); me.frm.save();
} }

4
utilities/doctype/rename_tool/rename_tool.js
View File

@ -28,9 +28,9 @@ cur_frm.cscript.setup_upload = function() {
select_doctype: cur_frm.doc.select_doctype select_doctype: cur_frm.doc.select_doctype
}, },
sample_url: "e.g. http://example.com/somefile.csv", sample_url: "e.g. http://example.com/somefile.csv",
callback: function(r) { callback: function(fid, filename, r) {
$log.empty().html("<hr>"); $log.empty().html("<hr>");
$.each(r, function(i, v) { $.each(r.message, function(i, v) {
$("<div>" + v + "</div>").appendTo($log); $("<div>" + v + "</div>").appendTo($log);
}); });
} }