Sfoglia il codice sorgente

[fix] missing dataurl in on_attach

version-14
Saurabh 7 anni fa
parent
commit
f362f84238
2 ha cambiato i file con 4 aggiunte e 3 eliminazioni
  1. +1
    -0
      frappe/public/js/frappe/form/grid.js
  2. +3
    -3
      frappe/public/js/frappe/upload.js

+ 1
- 0
frappe/public/js/frappe/form/grid.js Vedi 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) {


+ 3
- 3
frappe/public/js/frappe/upload.js Vedi 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;
}


Caricamento…
Annulla
Salva