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

Merge pull request #4291 from saurabh6790/upload_attendance_fix

Browse source 
[fix] missing dataurl in on_attach
This commit is contained in:
Saurabh 2017-10-10 12:32:51 +05:30 • committed by GitHub
commit b3ee2d56fc
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -561,6 +561,7 @@ frappe.ui.form.Grid = Class.extend({
me.setup_download();
// upload
frappe.flags.no_socketio = true;
$(this.wrapper).find(".grid-upload").removeClass("hide").on("click", function() {
frappe.prompt({fieldtype:"Attach", label:"Upload File"},
function(data) {

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

@ -239,12 +239,12 @@ frappe.upload = {
}
},
_upload_file: function(fileobj, args, opts) {
_upload_file: function(fileobj, args, opts, dataurl) {
if (args.file_size) {
frappe.upload.validate_max_file_size(args.file_size);
}
if(opts.on_attach) {
opts.on_attach(args)
opts.on_attach(args, dataurl)
} else {
if (opts.confirm_is_private) {
frappe.prompt({
@ -291,7 +291,7 @@ frappe.upload = {
freader.readAsDataURL(fileobj);
}
if (opts.no_socketio) {
if (opts.no_socketio || frappe.flags.no_socketio) {
upload_with_filedata();
return;
}