Saurabh
7 years ago
2 changed files with 4 additions and 3 deletions
Unified View
Diff Options
+ 1
- 0
frappe/public/js/frappe/form/grid.js
View File
| @@ -561,6 +561,7 @@ frappe.ui.form.Grid = Class.extend({ | |||||
| me.setup_download(); | me.setup_download(); | ||||
| // upload | // upload | ||||
| frappe.flags.no_socketio = true; | |||||
| $(this.wrapper).find(".grid-upload").removeClass("hide").on("click", function() { | $(this.wrapper).find(".grid-upload").removeClass("hide").on("click", function() { | ||||
| frappe.prompt({fieldtype:"Attach", label:"Upload File"}, | frappe.prompt({fieldtype:"Attach", label:"Upload File"}, | ||||
| function(data) { | function(data) { | ||||
+ 3
- 3
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) { | if (args.file_size) { | ||||
| frappe.upload.validate_max_file_size(args.file_size); | frappe.upload.validate_max_file_size(args.file_size); | ||||
| } | } | ||||
| if(opts.on_attach) { | if(opts.on_attach) { | ||||
| opts.on_attach(args) | |||||
| opts.on_attach(args, dataurl) | |||||
| } else { | } else { | ||||
| if (opts.confirm_is_private) { | if (opts.confirm_is_private) { | ||||
| frappe.prompt({ | frappe.prompt({ | ||||
| @@ -291,7 +291,7 @@ frappe.upload = { | |||||
| freader.readAsDataURL(fileobj); | freader.readAsDataURL(fileobj); | ||||
| } | } | ||||
| if (opts.no_socketio) { | |||||
| if (opts.no_socketio || frappe.flags.no_socketio) { | |||||
| upload_with_filedata(); | upload_with_filedata(); | ||||
| return; | return; | ||||
| } | } | ||||