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

Merge pull request #7338 from frappe/fix-grid-upload

Browse source 
fix: Remove unwanted frappe.upload.get_strting in grid.js
This commit is contained in:
Suraj Shetty 2019-04-23 09:47:14 +05:30 • committed by GitHub
commit 565bc8789d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/public/js/frappe/form/grid.js
View file

@ -664,7 +664,7 @@ export default class Grid {
as_dataurl: true,
allow_multiple: false,
on_success(file) {
var data = frappe.utils.csv_to_array(frappe.upload.get_string(file.dataurl));
var data = frappe.utils.csv_to_array(frappe.utils.get_decoded_string(file.dataurl));
// row #2 contains fieldnames;
var fieldnames = data[2];

6
frappe/public/js/frappe/misc/utils.js
View file

@ -702,6 +702,12 @@ Object.assign(frappe.utils, {
} else {
return filename;
}
},
get_decoded_string(dataURI) {
// decodes base64 to string
let parts = dataURI.split(',');
const encoded_data = parts[1];
return decodeURIComponent(escape(atob(encoded_data)));
}
});